SmartDukaan – /

Rev 3132 – Side effect of client name changes

rajveer — Wed, 31 Aug 2011 20:22:47 +0530

rajveer – 26 file(s) modified
Side effect of client name changes

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddressHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthorizePickupHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/FlagOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/NostockOrderhandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/PrintPendingOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ProcessReturnOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReceiveReturnHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RequestPickupHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReshipOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReturnOrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ShipOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ValidateDoaHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/VerifyOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/LogisticsUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/PendingOrdersServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/PoSheetGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/WareHouseUtils.java

Rev 3131 – CRM service python stub.

rajveer — Wed, 31 Aug 2011 20:20:48 +0530

rajveer – 6 file(s) modified
CRM service python stub.

+ /trunk/PyProj/src/shop2020/thriftpy/crm
+ /trunk/PyProj/src/shop2020/thriftpy/crm/constants.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/crm/__init__.py

Rev 3130 – Added support to read config section variable from environment.

rajveer — Wed, 31 Aug 2011 20:19:37 +0530

rajveer – 2 file(s) modified
Added support to read config section variable from environment.

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

Rev 3129 – Side effect of name changing of clients.

rajveer — Wed, 31 Aug 2011 20:18:11 +0530

rajveer – 2 file(s) modified
Side effect of name changing of clients.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/LoginServiceImpl.java

Rev 3128 – Side effect of name changing of clients.

rajveer — Wed, 31 Aug 2011 20:16:54 +0530

rajveer – 9 file(s) modified
Side effect of name changing of clients.

~ /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/UserCartController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java

Rev 3127 – Side effect of name changing of clients.

rajveer — Wed, 31 Aug 2011 20:14:56 +0530

rajveer – 5 file(s) modified
Side effect of name changing of clients.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java

Rev 3126 – Side effect of name changing of clients.

rajveer — Wed, 31 Aug 2011 20:13:00 +0530

rajveer – 44 file(s) modified
Side effect of name changing of clients.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrowseHistoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompletedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EmailAvailabilityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ForgotPasswordController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginDetailsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.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/PersonalDetailsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/TrackingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/CreateUserInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CodPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 3125 – Side effect of name changing of clients.

rajveer — Wed, 31 Aug 2011 20:09:54 +0530

rajveer – 17 file(s) modified
Side effect of name changing of clients.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserCommunicationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/utils/ReportsUtils.java

Rev 3124 – Updated config server to take section as environment variable which ...

rajveer — Wed, 31 Aug 2011 20:07:35 +0530

rajveer – 12 file(s) modified
Updated config server to take section as environment variable which should be read from environment.
Build support to automatically failing over to another service instance in case one service is down. Updated names of the clients to make them consistent.

x /trunk/PyProj/src/shop2020/clients/BasicClient.py
+ /trunk/PyProj/src/shop2020/clients/CatalogClient.py (copied from /trunk/PyProj/src/shop2020/clients/InventoryClient.py@3122)
~ /trunk/PyProj/src/shop2020/clients/DataLoggingClient.py
+ /trunk/PyProj/src/shop2020/clients/GenericClient.py (copied from /trunk/PyProj/src/shop2020/clients/BasicClient.py@3122)
~ /trunk/PyProj/src/shop2020/clients/HelperClient.py
x /trunk/PyProj/src/shop2020/clients/InventoryClient.py
~ /trunk/PyProj/src/shop2020/clients/LogisticsClient.py
~ /trunk/PyProj/src/shop2020/clients/PaymentClient.py
~ /trunk/PyProj/src/shop2020/clients/PromotionClient.py
~ /trunk/PyProj/src/shop2020/clients/TransactionClient.py
~ /trunk/PyProj/src/shop2020/clients/UserClient.py
~ /trunk/PyProj/src/shop2020/clients/WarehouseClient.py

Rev 3123 – Build support to automatically failing over to another service instance ...

rajveer — Wed, 31 Aug 2011 20:04:42 +0530

rajveer – 25 file(s) modified
Build support to automatically failing over to another service instance in case one service is down. Updated names of the clients to make them consistent.
Updated config file to handle all configurations in one file only.

+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java (copied from /trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogServiceClient.java@3122)
x /trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogServiceClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/CRMClient.java (copied from /trunk/Common/src/main/java/in/shop2020/thrift/clients/CRMServiceClient.java@3122)
x /trunk/Common/src/main/java/in/shop2020/thrift/clients/CRMServiceClient.java
~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/DataLoggingClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/GenericClient.java (copied from /trunk/Common/src/main/java/in/shop2020/thrift/clients/GenericServiceClient.java@3122)
x /trunk/Common/src/main/java/in/shop2020/thrift/clients/GenericServiceClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/HelperClient.java (copied from /trunk/Common/src/main/java/in/shop2020/thrift/clients/HelperServiceClient.java@3122)
x /trunk/Common/src/main/java/in/shop2020/thrift/clients/HelperServiceClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/LogisticsClient.java (copied from /trunk/Common/src/main/java/in/shop2020/thrift/clients/LogisticsServiceClient.java@3122)
x /trunk/Common/src/main/java/in/shop2020/thrift/clients/LogisticsServiceClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/PaymentClient.java (copied from /trunk/Common/src/main/java/in/shop2020/thrift/clients/PaymentServiceClient.java@3122)
x /trunk/Common/src/main/java/in/shop2020/thrift/clients/PaymentServiceClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/PromotionClient.java (copied from /trunk/Common/src/main/java/in/shop2020/thrift/clients/PromotionServiceClient.java@3122)
x /trunk/Common/src/main/java/in/shop2020/thrift/clients/PromotionServiceClient.java
~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/TestClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/TransactionClient.java (copied from /trunk/Common/src/main/java/in/shop2020/thrift/clients/TransactionServiceClient.java@3122)
x /trunk/Common/src/main/java/in/shop2020/thrift/clients/TransactionServiceClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/UserClient.java (copied from /trunk/Common/src/main/java/in/shop2020/thrift/clients/UserContextServiceClient.java@3102)
x /trunk/Common/src/main/java/in/shop2020/thrift/clients/UserContextServiceClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/WarehouseClient.java (copied from /trunk/Common/src/main/java/in/shop2020/thrift/clients/WarehouseServiceClient.java@3122)
x /trunk/Common/src/main/java/in/shop2020/thrift/clients/WarehouseServiceClient.java
~ /trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/Common/src/main/resources/shop2020.cfg

Rev 3122 – Bulk upload itemActivities.

vikas — Wed, 31 Aug 2011 19:04:39 +0530

vikas – 1 file(s) modified
Bulk upload itemActivities.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyAggregatorServlet.java

Rev 3121 – Open orders will now show truly open orders

chandranshu — Wed, 31 Aug 2011 18:36:45 +0530

chandranshu – 3 file(s) modified
Open orders will now show truly open orders

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java

Rev 3120 – Updated 'Invalid Coupon' message

varun.gupta — Wed, 31 Aug 2011 18:33:36 +0530

varun.gupta – 1 file(s) modified
Updated 'Invalid Coupon' message

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

Rev 3119 – Changed text of after sales and removed highlight of open ...

rajveer — Wed, 31 Aug 2011 18:24:29 +0530

rajveer – 2 file(s) modified
Changed text of after sales and removed highlight of open orders in order details page

~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm

Rev 3118 – Latest arrivals and best sellers snippets were not set. because ...

vikas — Wed, 31 Aug 2011 18:13:21 +0530

vikas – 4 file(s) modified
Latest arrivals and best sellers snippets were not set. because of which the best sellers and latest arrivals tabs were coming blank.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-index.vm

Rev 3117 – Frame size now setting to fixed size

varun.gupta — Wed, 31 Aug 2011 17:56:47 +0530

varun.gupta – 2 file(s) modified
Frame size now setting to fixed size

~ /trunk/Social/src/main/webapp/css/community-promotion.css
~ /trunk/Social/src/main/webapp/js/community-promotion.js

Rev 3116 – Add cronjob to persist product activity for previous date.

vikas — Wed, 31 Aug 2011 17:55:17 +0530

vikas – 6 file(s) modified
Add cronjob to persist product activity for previous date.

+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/ItemActivity.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/ItemActivityRepository.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyAggregatorServlet.java
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity.jsp
+ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml

Rev 3115 – Redirecting logs appropriately Trac#488

mandeep.dhir — Wed, 31 Aug 2011 16:53:41 +0530

mandeep.dhir – 1 file(s) modified
Redirecting logs appropriately Trac#488

~ /trunk/runutils/run-crm-service.sh

Rev 3114 – Adding a script to start CRM server Trac#488

mandeep.dhir — Wed, 31 Aug 2011 16:51:05 +0530

mandeep.dhir – 1 file(s) modified
Adding a script to start CRM server Trac#488

+ /trunk/runutils/run-crm-service.sh

Rev 3113 – Fix href to home page.

vikas — Wed, 31 Aug 2011 16:17:27 +0530

vikas – 2 file(s) modified
Fix href to home page.

~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm

Rev 3112 – Add caching of best deals, best sellers and latest arrivals ...

vikas — Wed, 31 Aug 2011 16:01:25 +0530

vikas – 8 file(s) modified
Add caching of best deals, best sellers and latest arrivals pages.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/EhcacheWrapper.java
~ /trunk/Website/src/main/resources/ehcache.xml
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm

Rev 3111 – Added remarketing code for google ad and ohana. Add conversion ...

vikas — Wed, 31 Aug 2011 15:54:51 +0530

vikas – 5 file(s) modified
Added remarketing code for google ad and ohana. Add conversion tracking for ohana.

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
+ /trunk/Website/src/main/webapp/js/remarketing.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/production/resources/templates/commonjsfiles.vm

Rev 3110 – Add new columns.

vikas — Wed, 31 Aug 2011 15:51:02 +0530

vikas – 1 file(s) modified
Add new columns.

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

Rev 3109 – Added script to start config server

rajveer — Wed, 31 Aug 2011 15:42:42 +0530

rajveer – 1 file(s) modified
Added script to start config server

+ /trunk/runutils/start-config-service.sh

Rev 3108 – Added some space after radio buttons

chandranshu — Wed, 31 Aug 2011 14:10:58 +0530

chandranshu – 2 file(s) modified
Added some space after radio buttons

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

Rev 3107 – Added more logging statements and removed the newline in warehouse ...

chandranshu — Wed, 31 Aug 2011 13:35:05 +0530

chandranshu – 3 file(s) modified
Added more logging statements and removed the newline in warehouse location

~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java

Rev 3106 – Trac#488 - Added ActivityType and remodelled ticket/activity a bit. ...

mandeep.dhir — Wed, 31 Aug 2011 13:29:30 +0530

mandeep.dhir – 28 file(s) modified
Trac#488
- Added ActivityType and remodelled ticket/activity a bit.
- Made hyperlinks to go to ticket details from activity page
- Clicking on 'Saholic URL', the header will go to home page
- Added styling over HTML tables displaying shipment updates and activities for a ticket
- Removed unnecessary columns from the UI

~ /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/UserActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.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-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-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/Crm/src/main/webapp/WEB-INF/content/user-tickets-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /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/ActivityType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ContactMedium.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3105 – Replaced e.printStackTraces with logger.error

chandranshu — Wed, 31 Aug 2011 13:17:39 +0530

chandranshu – 5 file(s) modified
Replaced e.printStackTraces with logger.error

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PendingOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java

Rev 3104 – Added logging using logger

chandranshu — Wed, 31 Aug 2011 12:37:28 +0530

chandranshu – 1 file(s) modified
Added logging using logger

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

Rev 3103 – Added support for alerting the Operations Manager when the no. ...

chandranshu — Wed, 31 Aug 2011 12:36:28 +0530

chandranshu – 7 file(s) modified
Added support for alerting the Operations Manager when the no. of free AWB nos. for COD falls below a threshold

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberAlerter.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 3102 – Removed 5 models from the coupon ambit

varun.gupta — Tue, 30 Aug 2011 20:49:37 +0530

varun.gupta – 1 file(s) modified
Removed 5 models from the coupon ambit

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

Rev 3101 – New payment page with lots of GA tracking

chandranshu — Tue, 30 Aug 2011 19:26:13 +0530

chandranshu – 12 file(s) modified
New payment page with lots of GA tracking

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
+ /trunk/Website/src/main/resources/in/shop2020/serving/controllers/ProceedToPayController.properties
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
+ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/js/paymode-selection.js
+ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 3100 – Consolidating product activity in one table.

vikas — Tue, 30 Aug 2011 16:57:35 +0530

vikas – 1 file(s) modified
Consolidating product activity in one table.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity.jsp

Rev 3099 – We should create only one instance of persistence manager factor. ...

vikas — Tue, 30 Aug 2011 16:56:44 +0530

vikas – 3 file(s) modified
We should create only one instance of persistence manager factor. Using a sigleton to force it.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/ItemRepository.java
~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/MessageRepository.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/PMF.java

Rev 3098 – Support of simple caching in services added. Added one decorator ...

rajveer — Tue, 30 Aug 2011 14:04:34 +0530

rajveer – 5 file(s) modified
Support of simple caching in services added. Added one decorator memoized which will memoize the return values of a function for a predefined time period.
Initially added 1 hour caching for get_logistics_estimation(destination_pin, item_selling_price, warehouse_location=None, type=DeliveryType.PREPAID) method.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
+ /trunk/PyProj/src/shop2020/utils/caching
+ /trunk/PyProj/src/shop2020/utils/caching/SimpleCaching.py
+ /trunk/PyProj/src/shop2020/utils/caching/TestCaching.py
+ /trunk/PyProj/src/shop2020/utils/caching/__init__.py

Rev 3097 – Allow bulk insert of catalog items.

vikas — Tue, 30 Aug 2011 13:59:48 +0530

vikas – 2 file(s) modified
Allow bulk insert of catalog items.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/ItemRepository.java
~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/UploadCatalogItemsServlet.java

Rev 3096 – Trac#488 Added feature to search tickets by Id

mandeep.dhir — Tue, 30 Aug 2011 13:34:25 +0530

mandeep.dhir – 5 file(s) modified
Trac#488 Added feature to search tickets by Id

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.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

Rev 3095 – Updating the key names.

vikas — Tue, 30 Aug 2011 12:55:20 +0530

vikas – 1 file(s) modified
Updating the key names.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java

Rev 3094 – Model the catalog items using jdo.

vikas — Tue, 30 Aug 2011 11:47:41 +0530

vikas – 3 file(s) modified
Model the catalog items using jdo.

+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/Item.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/ItemRepository.java
~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/UploadCatalogItemsServlet.java

Rev 3093 – Trac#488 Moving BlueDartTrackingService to Common Adding client details for CRM ...

mandeep.dhir — Tue, 30 Aug 2011 11:38:57 +0530

mandeep.dhir – 8 file(s) modified
Trac#488 Moving BlueDartTrackingService to Common
Adding client details for CRM server

+ /trunk/Common/src/main/java/in/shop2020/serving
+ /trunk/Common/src/main/java/in/shop2020/serving/model
+ /trunk/Common/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java (copied from /trunk/Website/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java@3067)
+ /trunk/Common/src/main/java/in/shop2020/serving/services
+ /trunk/Common/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java (copied from /trunk/Website/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java@3067)
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/CRMServiceClient.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/Common/src/main/resources/shop2020.cfg