SmartDukaan – /

Rev 3597 – Trac#540 Updating content model for Laptops as per Vrinda's suggestions

mandeep.dhir — Wed, 12 Oct 2011 12:16:39 +0530

mandeep.dhir – 4 file(s) modified
Trac#540 Updating content model for Laptops as per Vrinda's suggestions

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/ContentStore/src/xml/model/units.xml

Rev 3596 –

rajveer — Wed, 12 Oct 2011 12:00:40 +0530

rajveer – 2 file(s) modified

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html

Rev 3595 – Added all main page divs.

rajveer — Tue, 11 Oct 2011 19:54:29 +0530

rajveer – 2 file(s) modified
Added all main page divs.

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html

Rev 3594 – orderfulfillment etl with delay_reason column added

vikas — Tue, 11 Oct 2011 19:39:03 +0530

vikas – 1 file(s) modified
orderfulfillment etl with delay_reason column added

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

Rev 3593 –

rajveer — Tue, 11 Oct 2011 19:26:36 +0530

rajveer – 1 file(s) modified

~ /prototype/Website 2.0 S/WebContent/css/home.css

Rev 3592 – Added product banner

rajveer — Tue, 11 Oct 2011 19:25:09 +0530

rajveer – 3 file(s) modified
Added product banner

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html
+ /prototype/Website 2.0 S/WebContent/images/product-banner.jpg

Rev 3591 – Footer completed

varun.gupta — Tue, 11 Oct 2011 19:13:32 +0530

varun.gupta – 2 file(s) modified
Footer completed

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html

Rev 3590 – Trac#540 Updating content model for Laptops as per Vrinda's suggestions

mandeep.dhir — Tue, 11 Oct 2011 18:55:22 +0530

mandeep.dhir – 5 file(s) modified
Trac#540 Updating content model for Laptops as per Vrinda's suggestions

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/ContentStore/src/xml/model/units.xml

Rev 3589 – Widget updated.

rajveer — Tue, 11 Oct 2011 18:39:10 +0530

rajveer – 2 file(s) modified
Widget updated.

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html

Rev 3588 – Some clean ups in source tracking code.

vikas — Tue, 11 Oct 2011 18:38:32 +0530

vikas – 1 file(s) modified
Some clean ups in source tracking code.

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

Rev 3587 –

rajveer — Tue, 11 Oct 2011 17:47:25 +0530

rajveer – 2 file(s) modified

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html

Rev 3586 – Header menu completed

varun.gupta — Tue, 11 Oct 2011 17:44:29 +0530

varun.gupta – 2 file(s) modified
Header menu completed

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html

Rev 3585 – Cart widget basic structure completed.

rajveer — Tue, 11 Oct 2011 16:22:57 +0530

rajveer – 2 file(s) modified
Cart widget basic structure completed.

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html

Rev 3584 – Factored out some small methods

chandranshu — Tue, 11 Oct 2011 16:10:50 +0530

chandranshu – 1 file(s) modified
Factored out some small methods

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

Rev 3583 – Removed individual methods for capturing HDFC and EBS payments from ...

chandranshu — Tue, 11 Oct 2011 16:10:15 +0530

chandranshu – 8 file(s) modified
Removed individual methods for capturing HDFC and EBS payments from Payment service. Added new class for handling HDFC EMI payments

+ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcEmiPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java

Rev 3582 – Updated styles.

rajveer — Tue, 11 Oct 2011 15:59:04 +0530

rajveer – 2 file(s) modified
Updated styles.

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html

Rev 3581 – Changed delay_reason to be of enum type

chandranshu — Tue, 11 Oct 2011 15:56:09 +0530

chandranshu – 3 file(s) modified
Changed delay_reason to be of enum type

~ /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

Rev 3580 – Look and feel of header with primary menu

varun.gupta — Tue, 11 Oct 2011 15:50:57 +0530

varun.gupta – 2 file(s) modified
Look and feel of header with primary menu

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html

Rev 3579 – Adding CRMService to trunk/pom.xml Trac#508

mandeep.dhir — Tue, 11 Oct 2011 15:44:21 +0530

mandeep.dhir – 1 file(s) modified
Adding CRMService to trunk/pom.xml Trac#508

~ /trunk/pom.xml

Rev 3578 – Trac#508 Adding functionality in CRM to help agents reach users ...

mandeep.dhir — Tue, 11 Oct 2011 15:43:34 +0530

mandeep.dhir – 18 file(s) modified
Trac#508 Adding functionality in CRM to help agents reach users that failed to make payments for transactions
Invoking refundOrder and verifyOrder methods in TransactionService (as suggested by Chandranshu)

~ /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/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.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/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3577 – Added source and sourceitempricing tables in catalog dump

rajveer — Tue, 11 Oct 2011 15:40:58 +0530

rajveer – 1 file(s) modified
Added source and sourceitempricing tables in catalog dump

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 3576 – Handled sourcepath.

rajveer — Tue, 11 Oct 2011 15:33:33 +0530

rajveer – 1 file(s) modified
Handled sourcepath.

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

Rev 3575 – Suppress warnings and generate content in proper directory.

rajveer — Tue, 11 Oct 2011 15:24:39 +0530

rajveer – 1 file(s) modified
Suppress warnings and generate content in proper directory.

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

Rev 3574 – Trac#540 Addind content model for Laptops

mandeep.dhir — Tue, 11 Oct 2011 15:18:36 +0530

mandeep.dhir – 7 file(s) modified
Trac#540 Addind content model for Laptops

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SlidesController.java
~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/ContentStore/src/xml/model/units.xml

Rev 3573 – Initialise the sources list.

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

rajveer – 1 file(s) modified
Initialise the sources list.

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

Rev 3572 – Syncing with the repository

varun.gupta — Tue, 11 Oct 2011 13:32:19 +0530

varun.gupta – 7 file(s) modified
Syncing with the repository

~ /prototype/Website 2.0 S/WebContent/css/home.css
~ /prototype/Website 2.0 S/WebContent/home.html
+ /prototype/Website 2.0 S/WebContent/images/BG_NavBar.png
+ /prototype/Website 2.0 S/WebContent/images/FooterBG.png
+ /prototype/Website 2.0 S/WebContent/images/FooterFootBG.png
+ /prototype/Website 2.0 S/WebContent/images/IconDownArrow_WhiteButton.png
+ /prototype/Website 2.0 S/WebContent/images/VerticalSeparator_NavBar.png

Rev 3571 – Adding static website project to svn branch.

rajveer — Tue, 11 Oct 2011 13:22:32 +0530

rajveer – 34 file(s) modified
Adding static website project to svn branch.

+ /prototype/Website 2.0 S/.project
+ /prototype/Website 2.0 S/.settings
+ /prototype/Website 2.0 S/.settings/.jsdtscope
+ /prototype/Website 2.0 S/.settings/org.eclipse.wst.common.component
+ /prototype/Website 2.0 S/.settings/org.eclipse.wst.common.project.facet.core.xml
+ /prototype/Website 2.0 S/.settings/org.eclipse.wst.jsdt.ui.superType.container
+ /prototype/Website 2.0 S/.settings/org.eclipse.wst.jsdt.ui.superType.name
+ /prototype/Website 2.0 S/WebContent
+ /prototype/Website 2.0 S/WebContent/css
+ /prototype/Website 2.0 S/WebContent/css/home.css
+ /prototype/Website 2.0 S/WebContent/home.html
+ /prototype/Website 2.0 S/WebContent/images
+ /prototype/Website 2.0 S/WebContent/images/button-glass-bg.png
+ /prototype/Website 2.0 S/WebContent/images/ButtonAddtoCart_ALLSTATES.png
+ /prototype/Website 2.0 S/WebContent/images/ButtonWhite_ALLSTATES.png
+ /prototype/Website 2.0 S/WebContent/images/IconAddtoCompare_ProdArea.png
+ /prototype/Website 2.0 S/WebContent/images/IconBestDeals_NavBar.png
+ /prototype/Website 2.0 S/WebContent/images/IconCompareWith_ProdArea.png
+ /prototype/Website 2.0 S/WebContent/images/IconCross_Lists_DEF.png
+ /prototype/Website 2.0 S/WebContent/images/IconCross_Lists_OVR.png
+ /prototype/Website 2.0 S/WebContent/images/IconDownArrow_SelectedTab.png
+ /prototype/Website 2.0 S/WebContent/images/IconDownArrow_UnselectedTab.png
+ /prototype/Website 2.0 S/WebContent/images/IconEmptyCart_CartSummary.png
+ /prototype/Website 2.0 S/WebContent/images/IconFreeDelivery_TopBar.png
+ /prototype/Website 2.0 S/WebContent/images/IconOfferPack_ProdList.png
+ /prototype/Website 2.0 S/WebContent/images/IconOfferPack_ProdPage.png
+ /prototype/Website 2.0 S/WebContent/images/IconSearchButton_ALLSTATES.png
+ /prototype/Website 2.0 S/WebContent/images/IconSupport_TopBar.png
+ /prototype/Website 2.0 S/WebContent/images/ListIcon_Cart_Default.png
+ /prototype/Website 2.0 S/WebContent/images/ListIcon_Cart_Mouseover.png
+ /prototype/Website 2.0 S/WebContent/images/saholic-logo.jpg
+ /prototype/Website 2.0 S/WebContent/images/sprite.png
+ /prototype/Website 2.0 S/WebContent/js
+ /prototype/Website 2.0 S/WebContent/js/jquery-1.6.4.min.js

Rev 3570 – Initial import.

rajveer — Tue, 11 Oct 2011 13:20:30 +0530

rajveer – 1 file(s) modified
Initial import.

+ /prototype/Website 2.0 S

Rev 3569 – Updated items in page from 15 to 50.

rajveer — Tue, 11 Oct 2011 11:42:19 +0530

rajveer – 1 file(s) modified
Updated items in page from 15 to 50.

~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemList.ui.xml

Rev 3568 – Lots of changes to the static content script

chandranshu — Mon, 10 Oct 2011 19:32:36 +0530

chandranshu – 1 file(s) modified
Lots of changes to the static content script

~ /trunk/runutils/update-static-content.sh

Rev 3567 – Populate MRP and SellingPrice when user clicks Add.

rajveer — Mon, 10 Oct 2011 18:49:10 +0530

rajveer – 1 file(s) modified
Populate MRP and SellingPrice when user clicks Add.

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

Rev 3566 – Reset cart should delete discounts also.

rajveer — Mon, 10 Oct 2011 18:24:48 +0530

rajveer – 1 file(s) modified
Reset cart should delete discounts also.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 3565 – Expire source cookie if user comes from another source.

rajveer — Mon, 10 Oct 2011 17:53:15 +0530

rajveer – 1 file(s) modified
Expire source cookie if user comes from another source.

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

Rev 3564 – Fixed the bug.

rajveer — Mon, 10 Oct 2011 17:36:16 +0530

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

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

Rev 3563 – Removed changeQuantity method from cartservice.

rajveer — Mon, 10 Oct 2011 17:10:20 +0530

rajveer – 5 file(s) modified
Removed changeQuantity method from cartservice.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.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/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 3562 – Updated method call.

rajveer — Mon, 10 Oct 2011 17:06:52 +0530

rajveer – 1 file(s) modified
Updated method call.

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

Rev 3561 – Support to display different prices for different sources.

rajveer — Mon, 10 Oct 2011 16:28:11 +0530

rajveer – 29 file(s) modified
Support to display different prices for different sources.

~ /trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
+ /trunk/Website/src/main/java/in/shop2020/serving/cache/SnippetCacheWrapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.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/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.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/MyPurchasesController.java
~ /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/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceAware.java
+ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.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/ContentServingService.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/IPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/SnippetType.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/struts.xml

Rev 3560 – Added support of content generation for different sources.

rajveer — Mon, 10 Oct 2011 16:26:41 +0530

rajveer – 2 file(s) modified
Added support of content generation for different sources.

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

Rev 3559 – Now execute() will return cart and list of Discount objects

varun.gupta — Mon, 10 Oct 2011 16:11:07 +0530

varun.gupta – 5 file(s) modified
Now execute() will return cart and list of Discount objects

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

Rev 3558 – Added code to insert and display prices for different sources.

rajveer — Mon, 10 Oct 2011 15:26:54 +0530

rajveer – 10 file(s) modified
Added code to insert and display prices for different sources.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/SourcePricesDialog.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/java/in/shop2020/catalog/dashboard/shared/SourcePricings.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/SourcePricesDialog.ui.xml