SmartDukaan – /

Rev 3748 – Add crmloader to cron.

vikas — Wed, 19 Oct 2011 11:33:37 +0530

vikas – 1 file(s) modified
Add crmloader to cron.

~ /trunk/pentaho/scripts/panScript.sh

Rev 3747 – CRMResponse report data loader.

vikas — Wed, 19 Oct 2011 11:29:36 +0530

vikas – 1 file(s) modified
CRMResponse report data loader.

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

Rev 3746 –

varun.gupta — Wed, 19 Oct 2011 05:40:06 +0530

varun.gupta – 2 file(s) modified

~ /prototype/Website1/src/main/webapp/css/cartflow.css
~ /prototype/Website1/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 3745 – cart page finished

varun.gupta — Wed, 19 Oct 2011 05:15:13 +0530

varun.gupta – 5 file(s) modified
cart page finished

~ /prototype/Website1/src/main/webapp/css/cart.css
~ /prototype/Website1/src/main/webapp/css/cartflow.css
~ /prototype/Website1/src/main/webapp/css/widgets.css
~ /prototype/Website1/src/main/webapp/js/cart-details.js
~ /prototype/Website1/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 3744 – Corrected category page Browse Tab display text. Also made registration ...

rajveer — Tue, 18 Oct 2011 19:14:07 +0530

rajveer – 4 file(s) modified
Corrected category page Browse Tab display text. Also made registration lightweight

~ /prototype/Website1/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /prototype/Website1/src/main/webapp/js/loginregister.js
~ /prototype/Website1/src/main/webapp/js/productCategory.js
~ /prototype/Website1/src/main/webapp/WEB-INF/content/login-index.vm

Rev 3743 – Images will be shown on intro page also

rajveer — Tue, 18 Oct 2011 18:21:30 +0530

rajveer – 1 file(s) modified
Images will be shown on intro page also

~ /prototype/Website1/src/main/resources/velocity/SlideGuide.vm

Rev 3742 – Trac#574, Trac#576 Removing special characters. Adding new video type format ...

mandeep.dhir — Tue, 18 Oct 2011 17:40:26 +0530

mandeep.dhir – 1 file(s) modified
Trac#574, Trac#576 Removing special characters. Adding new video type format and music format

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 3741 – renamed images

varun.gupta — Tue, 18 Oct 2011 17:22:09 +0530

varun.gupta – 3 file(s) modified
renamed images

x /prototype/Website1/src/main/webapp/images/MidTab_Selected.png.png
+ /prototype/Website1/src/main/webapp/images/MidTab_Unselected.png
x /prototype/Website1/src/main/webapp/images/MidTab_Unselected.png.png

Rev 3740 – Added all required CSS clases for cart header

varun.gupta — Tue, 18 Oct 2011 17:00:52 +0530

varun.gupta – 1 file(s) modified
Added all required CSS clases for cart header

~ /prototype/Website1/src/main/webapp/css/cartflow.css

Rev 3739 – New Cart header ready

varun.gupta — Tue, 18 Oct 2011 16:54:51 +0530

varun.gupta – 3 file(s) modified
New Cart header ready

~ /prototype/Website1/src/main/webapp/css/cartflow.css
~ /prototype/Website1/src/main/webapp/css/widgets.css
~ /prototype/Website1/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 3738 – Fixed add to cart issue on accessories page

rajveer — Tue, 18 Oct 2011 16:03:06 +0530

rajveer – 1 file(s) modified
Fixed add to cart issue on accessories page

~ /prototype/Website1/src/main/webapp/js/entity.js

Rev 3737 – Corrected the amount display issue on pay success page

rajveer — Tue, 18 Oct 2011 15:38:28 +0530

rajveer – 1 file(s) modified
Corrected the amount display issue on pay success page

~ /prototype/Website1/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 3736 – Show the category url on productpage bread crumbs

rajveer — Tue, 18 Oct 2011 15:29:11 +0530

rajveer – 2 file(s) modified
Show the category url on productpage bread crumbs

~ /prototype/Website1/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /prototype/Website1/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 3735 – Added total amount in cart widget

rajveer — Tue, 18 Oct 2011 15:19:48 +0530

rajveer – 10 file(s) modified
Added total amount in cart widget

~ /prototype/Website1/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /prototype/Website1/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /prototype/Website1/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /prototype/Website1/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /prototype/Website1/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /prototype/Website1/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /prototype/Website1/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
~ /prototype/Website1/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
~ /prototype/Website1/src/main/resources/templates/cartwidget.vm
~ /prototype/Website1/src/main/webapp/css/widgets.css

Rev 3734 – Added new resources

rajveer — Tue, 18 Oct 2011 13:20:16 +0530

rajveer – 29 file(s) modified
Added new resources

+ /prototype/Website1/src/main/webapp/images/Arrow_OrangeButton_AllScreens.png
+ /prototype/Website1/src/main/webapp/images/Button_AddNewAddress_ALLSTATES.png
+ /prototype/Website1/src/main/webapp/images/Button_Apply_ALLSTATES.png
+ /prototype/Website1/src/main/webapp/images/Button_EnterShippingInfo_ALLSTATES.png
+ /prototype/Website1/src/main/webapp/images/Button_MakePayment_ALLSTATES-copy.png
+ /prototype/Website1/src/main/webapp/images/Button_MakePayment_ALLSTATES copy.png
+ /prototype/Website1/src/main/webapp/images/Button_ProceedToPayment_ALLSTATES.png
+ /prototype/Website1/src/main/webapp/images/Button_UpdateDeliveryTime_ALLSTATES.png
+ /prototype/Website1/src/main/webapp/images/Button_ViewAllOrders_ALLSTATES.png
+ /prototype/Website1/src/main/webapp/images/Cross_DeleteRow_DEF.png
+ /prototype/Website1/src/main/webapp/images/Cross_DeleteRow_DWN.png
+ /prototype/Website1/src/main/webapp/images/Cross_DeleteRow_OVR.png
+ /prototype/Website1/src/main/webapp/images/Icons_CreditCardsPayment.png
+ /prototype/Website1/src/main/webapp/images/Icons_Security.png
+ /prototype/Website1/src/main/webapp/images/Icon_AddNewAddress_ALLSTATES.png
+ /prototype/Website1/src/main/webapp/images/Icon_DeliveryTime.png
+ /prototype/Website1/src/main/webapp/images/Icon_ShareOnFacebook.png
+ /prototype/Website1/src/main/webapp/images/LeftTab_Selected.png
+ /prototype/Website1/src/main/webapp/images/LeftTab_Unselected.png
+ /prototype/Website1/src/main/webapp/images/LeftTab_Unselected.png.png
+ /prototype/Website1/src/main/webapp/images/MidTab_Selected.png
+ /prototype/Website1/src/main/webapp/images/MidTab_Selected.png.png
+ /prototype/Website1/src/main/webapp/images/MidTab_Unselected.png.png
+ /prototype/Website1/src/main/webapp/images/number_selected.png
+ /prototype/Website1/src/main/webapp/images/number_Unselected.png
+ /prototype/Website1/src/main/webapp/images/RadioButton_Selected.png
+ /prototype/Website1/src/main/webapp/images/RadioButton_Unselected.png
+ /prototype/Website1/src/main/webapp/images/RightTab_Selected.png.png
+ /prototype/Website1/src/main/webapp/images/RightTab_Unselected.png.png

Rev 3733 – updated cart page

rajveer — Tue, 18 Oct 2011 13:19:09 +0530

rajveer – 3 file(s) modified
updated cart page

~ /prototype/Website1/src/main/resources/templates/cartwidget.vm
+ /prototype/Website1/src/main/webapp/css/cartflow.css
~ /prototype/Website1/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 3732 – Delivery Estimate and COD

varun.gupta — Tue, 18 Oct 2011 13:17:39 +0530

varun.gupta – 8 file(s) modified
Delivery Estimate and COD

~ /prototype/Website1/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /prototype/Website1/src/main/resources/velocity/ProductDetail.vm
~ /prototype/Website1/src/main/webapp/css/entity.css
~ /prototype/Website1/src/main/webapp/css/header-footer.css
~ /prototype/Website1/src/main/webapp/css/product.css
~ /prototype/Website1/src/main/webapp/css/widgets.css
~ /prototype/Website1/src/main/webapp/js/entity.js
~ /prototype/Website1/src/main/webapp/WEB-INF/content/estimate-index.vm

Rev 3731 – Even prepaid orders can be refunded now before they are ...

chandranshu — Tue, 18 Oct 2011 12:56:25 +0530

chandranshu – 1 file(s) modified
Even prepaid orders can be refunded now before they are shipped

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

Rev 3730 – Even prepaid orders can be refunded now before they are ...

chandranshu — Tue, 18 Oct 2011 12:55:37 +0530

chandranshu – 1 file(s) modified
Even prepaid orders can be refunded now before they are shipped

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

Rev 3729 – Even prepaid orders can be refunded now before they are ...

chandranshu — Tue, 18 Oct 2011 11:27:51 +0530

chandranshu – 1 file(s) modified
Even prepaid orders can be refunded now before they are shipped

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java

Rev 3728 – Added scripts to start python services at system startup

chandranshu — Mon, 17 Oct 2011 19:18:47 +0530

chandranshu – 10 file(s) modified
Added scripts to start python services at system startup

+ /trunk/runutils/init.d
+ /trunk/runutils/init.d/catalog-server
+ /trunk/runutils/init.d/config-server
+ /trunk/runutils/init.d/helper-server
+ /trunk/runutils/init.d/inventory-history-server
+ /trunk/runutils/init.d/logistics-server
+ /trunk/runutils/init.d/order-server
+ /trunk/runutils/init.d/promotion-server
+ /trunk/runutils/init.d/user-server
+ /trunk/runutils/init.d/warehouse-server

Rev 3727 – Removed yellow background.

rajveer — Mon, 17 Oct 2011 19:03:08 +0530

rajveer – 1 file(s) modified
Removed yellow background.

~ /trunk/Website/src/main/webapp/WEB-INF/content/diwali-cashback-terms-conditions.vm

Rev 3726 – Corrected diwali spelling.

rajveer — Mon, 17 Oct 2011 18:36:59 +0530

rajveer – 1 file(s) modified
Corrected diwali spelling.

~ /trunk/Website/src/main/resources/templates/mainbanner.vm

Rev 3725 – Added menu dividers

varun.gupta — Mon, 17 Oct 2011 18:25:03 +0530

varun.gupta – 1 file(s) modified
Added menu dividers

~ /prototype/Website1/src/main/webapp/css/header-footer.css

Rev 3724 – Add payment option for bulk transaction.

vikas — Mon, 17 Oct 2011 18:19:01 +0530

vikas – 4 file(s) modified
Add payment option for bulk transaction.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/CreateRTGSBulkOrders.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 3723 – Added background gradient

varun.gupta — Mon, 17 Oct 2011 17:59:12 +0530

varun.gupta – 1 file(s) modified
Added background gradient

~ /prototype/Website1/src/main/webapp/css/widgets.css

Rev 3722 – Updated code for diwali fastive banner

rajveer — Mon, 17 Oct 2011 17:44:30 +0530

rajveer – 4 file(s) modified
Updated code for diwali fastive banner

~ /trunk/Website/src/main/resources/templates/mainbanner.vm
+ /trunk/Website/src/main/webapp/images/diwali-cashback-offer.jpg
+ /trunk/Website/src/main/webapp/WEB-INF/content/diwali-cashback-terms-conditions.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm

Rev 3721 – Updated message for 100th order cashback compaign.

rajveer — Mon, 17 Oct 2011 17:22:46 +0530

rajveer – 1 file(s) modified
Updated message for 100th order cashback compaign.

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

Rev 3720 – Trac#511 Adding mandeep.dhir to the list of Content generation exit ...

mandeep.dhir — Mon, 17 Oct 2011 17:04:39 +0530

mandeep.dhir – 1 file(s) modified
Trac#511 Adding mandeep.dhir to the list of Content generation exit status receipients

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

Rev 3719 – Trac#511 Adding checks to skip Laptops for comparison

mandeep.dhir — Mon, 17 Oct 2011 17:00:19 +0530

mandeep.dhir – 4 file(s) modified
Trac#511 Adding checks to skip Laptops for comparison

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/AccessoriesFinder.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 3718 – Increased file upload limit to 25 MB.

rajveer — Mon, 17 Oct 2011 16:46:25 +0530

rajveer – 1 file(s) modified
Increased file upload limit to 25 MB.

~ /trunk/ContentCreation/src/main/resources/struts.xml

Rev 3717 – Trac#511 Adding checks to skip Laptops for comparison

mandeep.dhir — Mon, 17 Oct 2011 16:40:31 +0530

mandeep.dhir – 3 file(s) modified
Trac#511 Adding checks to skip Laptops for comparison

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java

Rev 3716 – Application of discount now restricted to max. one item in ...

varun.gupta — Mon, 17 Oct 2011 16:11:12 +0530

varun.gupta – 1 file(s) modified
Application of discount now restricted to max. one item in the cart.

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

Rev 3715 – Added laptops as action.

rajveer — Mon, 17 Oct 2011 16:07:05 +0530

rajveer – 1 file(s) modified
Added laptops as action.

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

Rev 3714 – Trac#511 Adding Laptops to main menu

mandeep.dhir — Mon, 17 Oct 2011 15:23:20 +0530

mandeep.dhir – 1 file(s) modified
Trac#511 Adding Laptops to main menu

~ /trunk/Website/src/main/resources/templates/mainmenu.vm

Rev 3713 – Discount values modified for Galaxy Tab and Mi-720

varun.gupta — Mon, 17 Oct 2011 15:22:15 +0530

varun.gupta – 1 file(s) modified
Discount values modified for Galaxy Tab and Mi-720

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

Rev 3712 – Trac#558 Added new video type FLV

mandeep.dhir — Mon, 17 Oct 2011 15:16:39 +0530

mandeep.dhir – 1 file(s) modified
Trac#558 Added new video type FLV

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 3711 – Trac#565 Added link to access relevant unread activities for an ...

mandeep.dhir — Mon, 17 Oct 2011 15:04:59 +0530

mandeep.dhir – 8 file(s) modified
Trac#565 Added link to access relevant unread activities for an agent
Added Expected delivery column in Order table listed on COD_VERIFICATION ticket

~ /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/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/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml

Rev 3710 – Increased the font size in text boxes

varun.gupta — Mon, 17 Oct 2011 14:42:11 +0530

varun.gupta – 1 file(s) modified
Increased the font size in text boxes

~ /prototype/Website1/src/main/webapp/css/header-footer.css

Rev 3709 – Added the new payment method to the constant map

chandranshu — Mon, 17 Oct 2011 13:47:00 +0530

chandranshu – 3 file(s) modified
Added the new payment method to the constant map

~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift