<!-- Layout and common templates -->
-<template id="debugger" inherit_id="website.debugger" name="Event Debugger">
- <xpath expr='//t[@t-set="debugger_hook"]' position="after">
- <script type="text/javascript" src="/website_sale/static/src/js/website.tour.sale.js"></script>
- </xpath>
+<template id="assets_frontend" inherit_id="website.assets_frontend" name="Shop">
+ <xpath expr="." position="inside">
+ <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+ <link rel='stylesheet' href='/website_sale/static/src/css/website_mail.css'/>
+ <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+ <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
+ <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
+ <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_buy.js"></script>
+ <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tracking.js"></script>
+ </xpath>
</template>
<template id="assets_editor" inherit_id="website.assets_editor" name="Shop Editor" groups="base.group_sale_manager">
<xpath expr="." position="inside">
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
- <script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js"></script>
+ <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop.js"></script>
</xpath>
</template>
</li>
</xpath>
</template>
+
<template id="search" name="Search hidden fields">
- <t t-if="attrib_values">
- <t t-foreach="attrib_values" t-as="a">
- <input type="hidden" name="attrib" t-att-value="'%s-%s' % (a[0], a[1])"/>
+ <form t-att-action="keep('/shop'+ ('/category/'+slug(category)) if category else '', search=0)" method="get" t-att-class="search_class">
+
+ <t t-if="attrib_values">
+ <t t-foreach="attrib_values" t-as="a">
+ <input type="hidden" name="attrib" t-att-value="'%s-%s' % (a[0], a[1])"/>
+ </t>
</t>
- </t>
- <input t-if="category" type="hidden" name="category" t-att-value="int(category or 0)"/>
- <div class="input-group">
- <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search"/>
- <span class="input-group-btn">
- <a class="btn btn-default a-submit"><i class="fa fa-search"/></a>
- </span>
+ <div class="input-group">
+ <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search"/>
+ <span class="input-group-btn">
+ <a class="btn btn-default a-submit"><i class="fa fa-search"/></a>
+ </span>
</div>
+
+ </form>
</template>
<template id="404">
<!-- Product item used by /shop and /shop/cart -->
<template id="products_item" name="Product item">
+ <form action="/shop/cart/update" method="post" style="display: inline-block;">
<div itemscope="itemscope" itemtype="http://schema.org/Product">
<div class="ribbon-wrapper">
<div class="ribbon btn btn-danger">Sale</div>
</div>
<div class="oe_product_image">
<a itemprop="url" t-att-href="keep('/shop/product/%s' % slug(product), page=(pager['page']['num'] if pager['page']['num']>1 else None))">
- <img itemprop="image" class="img img-responsive" t-attf-src="/website/image/product.template/#{product.id}/image#{'' if product_image_big else '?max_width=300&max_height=300'}"/>
+ <img itemprop="image" class="img img-responsive" t-att-src="website.image_url(product, 'image', None if product_image_big else '300x300')"/>
</a>
</div>
<section>
<h5><strong><a itemprop="name" t-att-href="keep('/shop/product/%s' % slug(product), page=(pager['page']['num'] if pager['page']['num']>1 else None))" t-field="product.name"/></strong></h5>
<div itemprop="offers" itemscope="itemscope" itemtype="http://schema.org/Offer" class="product_price" t-if="product.product_variant_ids">
<b>
- <t t-if="(website.compute_curency(product.lst_price) - product.price) > 0.1">
+ <t t-if="(compute_currency(product.lst_price) - product.price) > 0.1">
<del class="text-danger" style="white-space: nowrap;" t-field="product.lst_price" t-field-options='{
"widget": "monetary",
- "from_currency": "website.company_currency_id",
+ "from_currency": "website.currency_id",
"display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
}'/>&nbsp;
</t>
</div>
</section>
</div>
+ </form>
</template>
-<template id="products_description" inherit_id="website_sale.products_item" optional="disabled" name="Product Description">
+<template id="products_description" inherit_id="website_sale.products_item" active="False" customize_show="True" name="Product Description">
<xpath expr="//div[@class='product_price']" position="before">
<div class="text-info oe_subdescription" contenteditable="false">
<div itemprop="description" t-field="product.description_sale"></div>
</xpath>
</template>
-<template id="products_add_to_cart" inherit_id="website_sale.products_item" optional="disabled" name="Add to Cart">
+<template id="products_add_to_cart" inherit_id="website_sale.products_item" active="False" customize_show="True" name="Add to Cart">
<xpath expr="//div[@class='product_price']" position="inside">
- <form action="/shop/cart/update" method="post" style="display: inline-block;">
- <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
- <a class="btn btn-default btn-xs fa fa-shopping-cart a-submit"/>
- </form>
+ <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
+ <a class="btn btn-default btn-xs fa fa-shopping-cart a-submit"/>
</xpath>
</template>
<template id="products" name="Products">
<t t-call="website.layout">
- <t t-set="head">
- <t t-call="web.jqueryui_conflict">
- <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
- </t>
- <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
- <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
- <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
- <t t-raw="head or ''"/>
- </t>
<t t-set="additional_title">Shop</t>
<div id="wrap" class="js_sale">
<div class="oe_structure"/>
<div class="container oe_website_sale">
<div class="products_pager">
- <div class="row">
- <form t-att-action="keep('/shop',search='')" method="get" class="pagination form-inline col-md-3">
- <t t-call="website_sale.search"/>
- </form>
+ <div class="row" style="width: 100%;">
+ <t t-call="website_sale.search"><t t-set="search_class">pagination form-inline col-md-3</t></t>
<t t-call="website.pager"/>
</div>
</div>
t-attf-class="oe_product oe_grid oe-height-#{td_product['y']*2} #{ td_product['class'] }">
<div class="oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
-
- <div class="css_options" t-ignore="true" groups="base.group_website_publisher">
- <div t-attf-class="dropdown js_options" t-att-data-id="product.id">
- <button class="btn btn-default" t-att-id="'dopprod-%s' % product.id" role="button" data-toggle="dropdown">Options <span class="caret"></span></button>
- <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % product.id">
- <li class='dropdown-submenu'>
- <a tabindex="-1" href="#">Size</a>
- <ul class="dropdown-menu" name="size">
- <li><a href="#">
- <table>
- <tr>
- <td class="selected"></td>
- <td t-att-class="product.website_size_x > 1 and 'selected'"></td>
- <td t-att-class="product.website_size_x > 2 and 'selected'"></td>
- <td t-att-class="product.website_size_x > 3 and 'selected'"></td>
- </tr>
- <tr>
- <td t-att-class="product.website_size_y > 1 and 'selected'"></td>
- <td t-att-class="product.website_size_y > 1 and product.website_size_x > 1 and 'selected'"></td>
- <td t-att-class="product.website_size_y > 1 and product.website_size_x > 2 and 'selected'"></td>
- <td t-att-class="product.website_size_y > 1 and product.website_size_x > 3 and 'selected'"></td>
- </tr>
- <tr>
- <td t-att-class="product.website_size_y > 2 and 'selected'"></td>
- <td t-att-class="product.website_size_y > 2 and product.website_size_x > 1 and 'selected'"></td>
- <td t-att-class="product.website_size_y > 2 and product.website_size_x > 2 and 'selected'"></td>
- <td t-att-class="product.website_size_y > 2 and product.website_size_x > 3 and 'selected'"></td>
- </tr>
- <tr>
- <td t-att-class="product.website_size_y > 3 and 'selected'"></td>
- <td t-att-class="product.website_size_y > 3 and product.website_size_x > 1 and 'selected'"></td>
- <td t-att-class="product.website_size_y > 3 and product.website_size_x > 2 and 'selected'"></td>
- <td t-att-class="product.website_size_y > 3 and product.website_size_x > 3 and 'selected'"></td>
- </tr>
- </table>
- </a></li>
- </ul>
- </li>
- <li class='dropdown-submenu'>
- <a tabindex="-1" href="#">Styles</a>
- <ul class="dropdown-menu" name="style">
- <t t-foreach="styles" t-as="style">
- <li t-att-class="style_in_product(style, product) and 'active' or ''"><a href="#" t-att-data-id="style.id" t-att-data-class="style.html_class"><t t-esc="style.name"/></a></li>
- </t>
- </ul>
- </li>
- <li class='dropdown-submenu'>
- <a tabindex="-1" href="#">Promote</a>
- <ul class="dropdown-menu" name="sequence">
- <li><a href="#" class="js_go_to_top">Push to top</a></li>
- <li><a href="#" class="js_go_up">Push up</a>
- </li>
- <li><a href="#" class="js_go_down">Push down</a></li>
- <li><a href="#" class="js_go_to_bottom">Push to bottom</a></li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
<t t-set="product_image_big" t-value="td_product['x']+td_product['y'] > 2"/>
<t t-call="website_sale.products_item"/>
</div>
<!-- Add to cart button-->
<template id="categories_recursive" name="Category list">
- <li t-att-class="'active' if c.id == category else ''">
+ <li t-att-class="'active' if c.id == int(category or 0) else ''">
<a t-att-href="keep('/shop/category/' + slug(c), category=0)" t-field="c.name"></a>
<ul t-if="c.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
<t t-foreach="c.child_id" t-as="c">
</li>
</template>
-<template id="products_categories" inherit_id="website_sale.products" optional="disabled" name="Product Categories">
+<template id="products_categories" inherit_id="website_sale.products" active="False" customize_show="True" name="Product Categories">
<xpath expr="//div[@id='products_grid_before']" position="inside">
<ul class="nav nav-pills nav-stacked mt16">
<li t-att-class=" '' if category else 'active' "><a t-att-href="keep('/shop',category=0)">All Products</a></li>
</xpath>
</template>
-<template id="products_attributes" inherit_id="website_sale.products" optional="disabled" name="Product Attribute's Filters">
+<template id="products_attributes" inherit_id="website_sale.products" active="False" customize_show="True" name="Product Attribute's Filters">
<xpath expr="//div[@id='products_grid_before']" position="inside">
<form class="js_attributes" method="get">
<input type="hidden" name="search" t-att-value="search"/>
<select class="form-control" name="attrib">
<option value=""/>
<t t-foreach="a.value_ids" t-as="v">
- <option t-att-value="'%s-%s' % (a.id,v.id)" t-field="v.name" t-att-selected="'selected' if v.id in attrib_set else ''"/>
+ <option t-att-value="'%s-%s' % (a.id,v.id)" t-esc="v.name" t-att-selected="'selected' if v.id in attrib_set else ''"/>
</t>
</select>
</t>
</xpath>
</template>
-<template id="products_list_view" inherit_id="website_sale.products" optional="disabled" name="List View">
+<template id="products_list_view" inherit_id="website_sale.products" active="False" customize_show="True" name="List View">
<xpath expr="//div[@id='products_grid']//table" position="replace">
<t t-foreach="products" t-as="product">
<div class="oe_product oe_list oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
<template id="product" name="Product">
<t t-call="website.layout">
- <t t-set="head">
- <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
- <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
- <link rel='stylesheet' href='/website_sale/static/src/css/website_mail.css'/>
- </t>
<t t-set="additional_title" t-value="product.name"/>
<div itemscope="itemscope" itemtype="http://schema.org/Product" id="wrap" class="js_sale">
<div class="col-sm-4">
<ol class="breadcrumb">
<li><a t-att-href="keep(category=0)" onclick="history.go(-1); return false;">Products</a></li>
- <li t-if="category"><a t-att-href="keep()" t-field="category.name"/></li>
+ <li t-if="category"><a t-att-href="keep('/shop/category/%s' % slug(category), category=0)" t-field="category.name"/></li>
<li class="active"><span t-field="product.name"/></li>
</ol>
</div>
<div class="col-sm-3">
- <form t-att-action="keep(search=0)" method="get" class="pull-right">
- <t t-call="website_sale.search"/>
- </form>
+ <t t-call="website_sale.search"><t t-set="search_class">pull-right</t></t>
</div>
<div class="col-sm-4" groups="base.group_sale_manager">
<t t-call="website.publish_management">
</div>
</section>
- <section class="container oe_website_sale" id="product_detail">
+ <section t-attf-class="container oe_website_sale #{(compute_currency(product.lst_price) - product.price) > 0.1 and 'discount'}" id="product_detail">
<div class="row">
<div class="col-sm-7 col-md-7 col-lg-7">
<span itemprop="image" t-field="product.image" t-field-options='{"widget": "image", "class": "product_detail_img"}'/>
<t t-call="website_sale.product_price"/>
<p t-if="len(product.product_variant_ids) > 1" class="css_not_available_msg bg-danger" style="padding: 15px;">Product not available</p>
- <t t-placeholder="button">
- <a t-if="not optional_product_ids" class="btn btn-primary btn-lg mt8 a-submit js_check_product">Add to Cart</a>
- <a t-if="optional_product_ids" class="btn btn-primary btn-lg mt8 js_check_product" href="#" data-toggle="modal" data-target="#modal_optional_products">Add to Cart</a>
- </t>
- </div>
-
- <div t-if="optional_product_ids" id="modal_optional_products" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
- <div class="modal-dialog modal-lg">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
- <h4 class="modal-title" id="myModalLabel">Product to add in your shopping cart</h4>
- </div>
- <div class="modal-body">
-
- <table class="table table-striped table-condensed">
- <thead>
- <tr>
- <th colspan="2">Product</th>
- <th style="min-width: 140px;"> </th>
- <th width="100">Price</th>
- <th width="120">Quantity</th>
- </tr>
- </thead>
- <tbody>
- <tr id="product_confirmation">
- <td width="100">
- <span t-field="product.image_medium" t-field-options='{"widget": "image" }'/>
- </td>
- <td colspan="2">
- <strong t-field="product.name"/>
- <div class="text-muted">
- <div t-field="product.description_sale"/>
- <div class="js_attributes"></div>
- </div>
- </td>
- <td>
- <t t-if="(product.lst_price != product.price) > 0.1">
- <span class="text-danger" style="text-decoration: line-through; white-space: nowrap;"
- t-field="product.lst_price"
- t-field-options='{
- "widget": "monetary",
- "from_currency": "website.company_currency_id",
- "display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
- }'/><br/>
- </t>
- <span class="oe_price" style="white-space: nowrap;"
- t-field="product.price"
- t-field-options='{
- "widget": "monetary",
- "display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
- }'/>
- </td>
- <td>
- <div class="input-group">
- <span class="input-group-addon">
- <a t-attf-href="#" class="mb8 js_add_cart_json">
- <i class="fa fa-minus"></i>
- </a>
- </span>
- <input type="text" class="js_quantity form-control" data-min="1" name="add_qty" value="1"/>
- <span class="input-group-addon">
- <a t-attf-href="#" class="mb8 float_left js_add_cart_json">
- <i class="fa fa-plus"></i>
- </a>
- </span>
- </div>
- </td>
- </tr>
- <tr t-if="optional_product_ids"><td colspan="4"><h4>Select Your Options:</h4></td></tr>
- <t t-set="option_inc" t-value="0"/>
- <tr class="js_product" t-foreach="optional_product_ids" t-as="product">
- <td width="100">
- <input type="hidden" class="optional_product_id" t-attf-name="optional-product-#{option_inc}" t-att-value="int(product.product_variant_ids[0]) if len(product.product_variant_ids) == 1 else '0'"/>
- <span t-field="product.image_small" t-field-options='{"widget": "image"}'/>
- </td>
- <td>
- <div class="pull-left">
- <strong class="media-heading" t-field="product.name"/>
- <div class="text-muted" t-field="product.description_sale"/>
- </div>
- </td>
- <td>
- <div class="pull-right">
- <t t-call="website_sale.variants"/>
- </div>
- </td>
- <td>
- <t t-if="(website.compute_curency(product.lst_price) - product.price) > 0.1">
- <span class="text-danger" style="text-decoration: line-through; white-space: nowrap;"
- t-field="product.lst_price"
- t-field-options='{
- "widget": "monetary",
- "from_currency": "website.company_currency_id",
- "display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
- }'/><br/>
- </t>
- <span class="oe_price" style="white-space: nowrap;"
- t-field="product.price"
- t-field-options='{
- "widget": "monetary",
- "display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
- }'/>
- <p class="css_not_available_msg bg-danger" style="position:absolute; padding: 15px;">Product not available</p>
- </td>
- <td>
- <input type="hidden" class="js_optional_same_quantity" t-attf-name="optional-quantity-#{option_inc}" value="0"/>
- <a href="#" class="js_add"><strong>Add to Cart</strong></a>
- <span class="js_remove hidden">
- <span class="js_item">1 Item</span><span class="js_items hidden">5 Items</span><br/>
- <a href="#" class="js_remove"><small>Remove from cart</small></a>
- </span>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="modal-footer">
- <a class="btn btn-default a-submit js_goto_shop"><i class="fa fa-chevron-left"></i> Continue shopping</a>
- <a class="btn btn-primary pull-right a-submit"><i class="fa fa-shopping-cart fa-fw"></i> Proceed to checkout</a>
- </div>
- </div>
- </div>
+ <a id="add_to_cart" class="btn btn-primary btn-lg mt8 js_check_product a-submit" href="#">Add to Cart</a>
</div>
</form>
</t>
</template>
-<template id="product_confirmation" inherit_id="website_sale.product" optional="disabled" name="Confirm: Add To Cart">
- <xpath expr="//div[@id='modal_optional_products']" position="attributes">
- <attribute name="t-if">True</attribute>
- </xpath>
- <xpath expr="//t[@t-placeholder='button']" position="replace">
- <t t-placeholder="button">
- <a class="btn btn-primary btn-lg mt8 js_check_product" href="#" data-toggle="modal" data-target="#modal_optional_products">Add to Cart</a>
- </t>
- </xpath>
-</template>
-
-<template id="product_quantity" inherit_id="website_sale.product" optional="enabled" name="Select Quantity">
- <xpath expr="//t[@t-placeholder='button']" position="before">
- <div class="css_quantity input-group" style="width: 108px;">
+<template id="product_quantity" inherit_id="website_sale.product" customize_show="True" name="Select Quantity">
+ <xpath expr="//a[@id='add_to_cart']" position="before">
+ <div class="css_quantity input-group oe_website_spinner">
<span class="input-group-addon">
<a t-attf-href="#" class="mb8 js_add_cart_json">
<i class="fa fa-minus"></i>
<template id="product_price">
<div itemprop="offers" itemscope="itemscope" itemtype="http://schema.org/Offer" class="product_price mt16">
- <h4 class="oe_price_h4">
- <t t-if="(website.compute_curency(product.lst_price) - product.price) > 0.1">
- <span class="text-danger" style="text-decoration: line-through; white-space: nowrap;"
+ <h4 class="oe_price_h4 css_editable_mode_hidden">
+ <span class="text-danger oe_default_price" style="text-decoration: line-through; white-space: nowrap;"
t-field="product.lst_price"
t-field-options='{
"widget": "monetary",
- "from_currency": "website.company_currency_id",
+ "from_currency": "website.currency_id",
"display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
- }'/><br/>
- </t>
+ }'/>
<b class="oe_price" style="white-space: nowrap;"
t-field="product.price"
t-field-options='{
<span itemprop="price" style="display:none;" t-esc="product.price"/>
<span itemprop="priceCurrency" style="display:none;" t-esc="user_id.partner_id.property_product_pricelist.currency_id.name"/>
</h4>
+ <h4 class="css_editable_mode_display" style="display: none;">
+ <span t-field="product.lst_price"
+ t-field-options='{
+ "widget": "monetary",
+ "display_currency": "website.pricelist_id.currency_id"
+ }'/>
+ </h4>
+ <h4 class="hidden oe_not_available bg-warning">Product not available</h4>
</div>
</template>
-<template id="product_variants" inherit_id="website_sale.product" optional="disabled" name="List View of Variants">
+<template id="product_variants" inherit_id="website_sale.product" active="False" customize_show="True" name="List View of Variants">
<xpath expr="//t[@t-placeholder='select']" position="replace">
<input type="hidden" t-if="len(product.product_variant_ids) == 1" name="product_id" t-att-value="product.product_variant_ids[0].id"/>
<t t-if="len(product.product_variant_ids) > 1">
<label label-default="label-default" class="radio" t-foreach="product.product_variant_ids" t-as="variant_id">
- <input type="radio" name="product_id" t-att-value="variant_id.id"/>
+ <input type="radio" name="product_id" class="js_product_change" t-att-checked="'checked' if variant_id_index == 0 else ''" t-att-value="variant_id.id" t-att-data-lst_price="variant_id.lst_price" t-att-data-price="variant_id.price"/>
<span t-esc="variant_id.name_get()[0][1]"/>
<span class="badge" t-if="variant_id.price_extra">
- <t t-esc="variant_id.price_extra > 0 and '+' or ''"/><span t-field="variant_id.price_extra" style="white-space: nowrap;" t-field-options='{ "widget": "monetary", "display_currency": "pricelist.currency_id" }'/>
+ <t t-esc="variant_id.price_extra > 0 and '+' or ''"/><span t-field="variant_id.price_extra" style="white-space: nowrap;" t-field-options='{
+ "widget": "monetary",
+ "from_currency": "website.currency_id",
+ "display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
+ }'/>
</span>
</label>
</t>
</template>
<template id="variants">
- <ul t-attf-class="list-unstyled js_add_cart_variants #{ul_class}" t-att-data-attribute_value_ids="[[p.id, map(int, p.attribute_value_ids), p.price] for p in product.product_variant_ids]">
+ <t t-set="attribute_value_ids" t-value="get_attribute_value_ids(product)"/>
+ <ul t-attf-class="list-unstyled js_add_cart_variants #{ul_class}" t-att-data-attribute_value_ids="attribute_value_ids">
<t t-foreach="product.attribute_line_ids" t-as="variant_id">
<li t-if="len(variant_id.value_ids) > 1">
<span t-if="value_id.price_extra">
<t t-esc="value_id.price_extra > 0 and '+' or ''"/><span t-field="value_id.price_extra" style="white-space: nowrap;" t-field-options='{
"widget": "monetary",
+ "from_currency": "website.currency_id",
"display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
}'/>
</span>
<span t-field="value_id.name"/>
<span class="badge" t-if="value_id.price_extra">
<t t-esc="value_id.price_extra > 0 and '+' or ''"/><span t-field="value_id.price_extra" style="white-space: nowrap;" t-field-options='{
- "widget": "monetary",
- "display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
- }'/>
+ "widget": "monetary",
+ "from_currency": "website.currency_id",
+ "display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
+ }'/>
</span>
</label>
</li>
</ul>
</template>
-<template id="recommended_products" inherit_id="website_sale.product" optional="enabled" name="Alternative Products">
+<template id="recommended_products" inherit_id="website_sale.product" customize_show="True" name="Alternative Products">
<xpath expr="//div[@id='product_full_description']" position="after">
<div class="container mt32" t-if="product.alternative_product_ids">
<h3>Suggested alternatives:</h3>
</xpath>
</template>
-<template id="product_attributes" inherit_id="website_sale.product" optional="enabled" name="Product attributes">
+<template id="product_attributes" inherit_id="website_sale.product" customize_show="True" name="Product attributes">
<xpath expr="//p[@t-field='product.description_sale']" position="after">
<hr t-if="sum([(1 if len(l.value_ids)==1 else 0) for l in product.attribute_line_ids])"/>
<p class="text-muted">
<!-- Product options: OpenChatter -->
-<template id="product_comment" inherit_id="website_sale.product" optional="disabled" name="Discussion">
+<template id="product_comment" inherit_id="website_sale.product" active="False" customize_show="True" name="Discussion">
<xpath expr="//div[@t-field='product.website_description']" position="after">
<hr class="mb32"/>
<section class="container">
<ul class="media-list" id="comments-list" t-if="product.website_message_ids">
<li t-foreach="product.website_message_ids" t-as="message" class="media">
<div class="media-body oe_msg">
- <img class="media-object pull-left oe_msg_avatar" t-att-src="'/website/image?model=res.partner&field=image_small&id='+str(message.author_id.id)" style="width: 50px; margin-right: 10px;"/>
+ <img class="media-object pull-left oe_msg_avatar" t-att-src="website.image_url(message.author_id, 'image_small')" style="width: 50px; margin-right: 10px;"/>
<div class="media-body oe_msg_content">
<t t-call="website.publish_short">
<t t-set="object" t-value="message"/>
</ul>
<div class="css_editable_mode_hidden">
<form id="comment" t-attf-action="/shop/product/comment/#{product.id}" method="POST">
- <img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&field=image_small&id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>
+ <img class="img pull-left img-rounded" t-att-src="website.image_url(user_id.partner_id, 'image_small')" style="width: 50px; margin-right: 10px;"/>
<div class="pull-left mb32" style="width: 75%%">
<textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
<a class="btn btn-primary mt8 a-submit">Post</a>
<template id="cart" name="Shopping Cart">
<t t-call="website.layout">
- <t t-set="head">
- <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
- <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
- <t t-raw="head or ''"/>
- </t>
<div id="wrap">
<div class="container oe_website_sale">
</tr>
</thead>
<tbody>
- <tr t-foreach="website_sale_order.website_order_line" t-as="line">
+ <t t-foreach="website_sale_order.website_order_line" t-as="line">
+ <tr>
<td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
<td align="center" t-if="line.product_id.product_tmpl_id">
<span t-field="line.product_id.image_small"
</td>
<td t-if="line.product_id.product_tmpl_id">
<div>
- <a t-if="not line.linked_line_id" t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
+ <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
<strong t-esc="line.product_id.name_get()[0][1]"/>
</a>
- <t t-if="line.linked_line_id">
- <strong t-esc="line.product_id.name_get()[0][1]"/>
- </t>
</div>
<div class="text-muted" t-field="line.name"/>
</td>
<td class="text-center" name="price">
- <t t-if="(website.compute_curency(line.product_id.lst_price) - line.price_unit) > 0.1">
+ <t t-if="(line.price_unit - line.price_reduce) > 1">
<del class="text-danger" style="white-space: nowrap;"
- t-field="line.product_id.lst_price" t-field-options='{
+ t-field="line.price_unit" t-field-options='{
"widget": "monetary",
- "from_currency": "website.company_currency_id",
+ "from_currency": "website.currency_id",
"display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
}'/>&nbsp;
</t>
- <span t-field="line.price_unit" style="white-space: nowrap;" t-field-options='{
+ <span t-field="line.price_reduce" style="white-space: nowrap;" t-field-options='{
"widget": "monetary",
"display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
}'/>
</td>
<td class="text-center">
- <div class="input-group" t-if="not line.linked_line_id">
+ <div class="input-group oe_website_spinner">
<span class="input-group-addon">
- <a t-attf-href="#" class="mb8 js_add_cart_json">
+ <a t-attf-href="#" class="mb8 js_add_cart_json" data-no-instant="">
<i class="fa fa-minus"></i>
</a>
</span>
t-att-data-product-id="line.product_id.id"
t-att-value="int(line.product_uom_qty)"/>
<span class="input-group-addon">
- <a t-attf-href="#" class="mb8 float_left js_add_cart_json">
+ <a t-attf-href="#" class="mb8 float_left js_add_cart_json" data-no-instant="">
<i class="fa fa-plus"></i>
</a>
</span>
</div>
- <t t-if="line.linked_line_id">
- <span class="js_quantity" t-att-data-line-id="line.id" t-esc="int(line.product_uom_qty)"/>
- </t>
-
</td>
</tr>
+ </t>
</tbody>
</table>
<t t-call="website_sale.total"/>
</t>
</template>
-<template id="suggested_products_list" inherit_id="website_sale.cart" optional="enabled" name="Suggested Products in my cart">
+<template id="suggested_products_list" inherit_id="website_sale.cart" customize_show="True" name="Suggested Products in my cart">
<xpath expr="//table[@id='cart_products']" position="after">
<table t-if="suggested_products" class='table table-striped table-condensed'>
<colgroup>
<div class="text-muted" t-field="product.description_sale"/>
</td>
<td>
- <t t-if="(website.compute_curency(product.lst_price) - product.price) > 0.1">
+ <t t-if="(compute_currency(product.lst_price) - product.price) > 0.1">
<del class="text-danger" style="white-space: nowrap;"
t-field="product.lst_price" t-field-options='{
"widget": "monetary",
- "from_currency": "website.company_currency_id",
+ "from_currency": "website.currency_id",
"display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
}'/>&nbsp;
</t>
</xpath>
</template>
-<template id="continue_shopping" inherit_id="website_sale.cart" optional="enabled" name="Continue Shopping Button">
+<template id="continue_shopping" inherit_id="website_sale.cart" customize_show="True" name="Continue Shopping Button">
<xpath expr="//a[@href='/shop/checkout']" position="before">
<a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
</xpath>
</template>
-<template id="reduction_code" inherit_id="website_sale.cart" optional="disabled" name="Reduction Code">
+<template id="reduction_code" inherit_id="website_sale.cart" active="False" customize_show="True" name="Reduction Code">
<xpath expr="//div[@id='right_column']" position="inside">
<h4>Coupon Code</h4>
<p>
<template id="checkout">
<t t-call="website.layout">
- <t t-set="head">
- <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
- <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
- <t t-raw="head or ''"/>
- </t>
<t t-set="additional_title">Shop - Checkout</t>
<div id="wrap">
<div class="container oe_website_sale">
<input type="text" name="name" class="form-control" t-att-value="checkout.get('name')"/>
</div>
<div t-if="has_check_vat" class="clearfix"/>
- <div t-attf-class="form-group #{error.get('street2') and 'has-error' or ''} col-lg-6">
- <label class="control-label" for="street2" style="font-weight: normal">Company Name</label>
- <input type="text" name="street2" class="form-control" t-att-value="checkout.get('street2')"/>
+ <div t-attf-class="form-group #{error.get('street') and 'has-error' or ''} col-lg-6">
+ <label class="control-label" for="street" style="font-weight: normal">Company Name</label>
+ <input type="text" name="street" class="form-control" t-att-value="checkout.get('street')"/>
</div>
<div t-if="has_check_vat" t-attf-class="form-group #{error.get('vat') and 'has-error' or ''} col-lg-6">
<label class="control-label" for="vat" style="font-weight: normal">VAT Number</label>
<input type="tel" name="phone" class="form-control" t-att-value="checkout.get('phone')"/>
</div>
- <div t-attf-class="form-group #{error.get('street') and 'has-error' or ''} col-lg-6">
- <label class="control-label" for="street">Street</label>
- <input type="text" name="street" class="form-control" t-att-value="checkout.get('street')"/>
+ <div t-attf-class="form-group #{error.get('street2') and 'has-error' or ''} col-lg-6">
+ <label class="control-label" for="street2">Street</label>
+ <input type="text" name="street2" class="form-control" t-att-value="checkout.get('street2')"/>
</div>
<div class="clearfix"/>
<input type="text" name="city" class="form-control" t-att-value="checkout.get('city')"/>
</div>
<div t-attf-class="form-group #{error.get('zip') and 'has-error' or ''} col-lg-6">
- <label class="control-label" for="zip">Zip / Postal Code</label>
+ <label class="control-label" for="zip" style="font-weight: normal">Zip / Postal Code</label>
<input type="text" name="zip" class="form-control" t-att-value="checkout.get('zip')"/>
</div>
<div t-attf-class="form-group #{error.get('country_id') and 'has-error' or ''} col-lg-6">
<div class="clearfix"/>
- <div class="form-group col-lg-6" groups="sale.group_delivery_invoice_address">
- <label>
- <input type="checkbox" name="shipping_different" t-att-checked="checkout.get('shipping_different')"/>
- <span>Ship to a different address</span>
- </label>
+ <div class="form-group col-lg-12">
+ <label>Shipping</label>
+ <select name="shipping_id" class="form-control">
+ <option value="0">Ship to the same address</option>
+ <t t-foreach="shippings" t-as="shipping">
+ <option t-att-value="shipping.id" t-att-selected="shipping.id == shipping_id"
+ t-att-data-shipping_name="shipping.name"
+ t-att-data-shipping_phone="shipping.phone"
+ t-att-data-shipping_street="shipping.street"
+ t-att-data-shipping_city="shipping.city"
+ t-att-data-shipping_zip="shipping.zip"
+ t-att-data-shipping_state_id="shipping.state_id and shipping.state_id.id"
+ t-att-data-shipping_country_id="shipping.country_id and shipping.country_id.id"
+ ><t t-esc="', '.join('\n'.join(shipping.name_get()[0][1].split(',')).split('\n')[1:])"/></option>
+ </t>
+ <option value="-1" t-att-selected="error and len(error) > 0 and shipping_id == -1">-- Create a new address --</option>
+ </select>
</div>
</div>
- <div class="js_shipping row mb16" t-att-style="not checkout.get('shipping_different') and 'display:none' or ''" groups="sale.group_delivery_invoice_address">
+ <div class="js_shipping row mb16" t-att-style="not shipping_id and 'display:none' or ''">
<h3 class="oe_shipping col-lg-12 mt16">Shipping Information</h3>
<div t-attf-class="form-group #{error.get('shipping_name') and 'has-error' or ''} col-lg-6">
<label class="control-label" for="shipping_name">Name (Shipping)</label>
- <input type="text" name="shipping_name" class="form-control" t-att-value="checkout.get('shipping_name', '')"/>
+ <input type="text" name="shipping_name" class="form-control" t-att-value="checkout.get('shipping_name', '')" t-att-readonly="'readonly' if shipping_id >= 0 else ''"/>
</div>
<div t-attf-class="form-group #{error.get('shipping_phone') and 'has-error' or ''} col-lg-6">
<label class="control-label" for="shipping_phone">Phone</label>
- <input type="tel" name="shipping_phone" class="form-control" t-att-value="checkout.get('shipping_phone', '')"/>
+ <input type="tel" name="shipping_phone" class="form-control" t-att-value="checkout.get('shipping_phone', '')" t-att-readonly=" 'readonly' if shipping_id >= 0 else ''"/>
</div>
<div t-attf-class="form-group #{error.get('shipping_street') and 'has-error' or ''} col-lg-6">
<label class="control-label" for="shipping_street">Street</label>
- <input type="text" name="shipping_street" class="form-control" t-att-value="checkout.get('shipping_street', '')"/>
+ <input type="text" name="shipping_street" class="form-control" t-att-value="checkout.get('shipping_street', '')" t-att-readonly=" 'readonly' if shipping_id >= 0 else ''"/>
</div>
<div class="clearfix"/>
<div t-attf-class="form-group #{error.get('shipping_city') and 'has-error' or ''} col-lg-6">
<label class="control-label" for="shipping_city">City</label>
- <input type="text" name="shipping_city" class="form-control" t-att-value="checkout.get('shipping_city', '')"/>
+ <input type="text" name="shipping_city" class="form-control" t-att-value="checkout.get('shipping_city', '')" t-att-readonly=" 'readonly' if shipping_id >= 0 else ''"/>
</div>
<div t-attf-class="form-group #{error.get('shipping_zip') and 'has-error' or ''} col-lg-6">
- <label class="control-label" for="shipping_zip">Zip / Postal Code</label>
- <input type="text" name="shipping_zip" class="form-control" t-att-value="checkout.get('shipping_zip', '')"/>
+ <label class="control-label" for="shipping_zip" style="font-weight: normal">Zip / Postal Code</label>
+ <input type="text" name="shipping_zip" class="form-control" t-att-value="checkout.get('shipping_zip', '')" t-att-readonly=" 'readonly' if shipping_id >= 0 else ''"/>
</div>
<div t-attf-class="form-group #{error.get('shipping_country_id') and 'has-error' or ''} col-lg-6">
<label class="control-label" for="shipping_country_id">Country</label>
- <select name="shipping_country_id" class="form-control">
+ <select name="shipping_country_id" class="form-control" t-att-disabled=" 'disabled' if shipping_id >= 0 else ''">
<option value="">Country...</option>
<t t-foreach="countries or []" t-as="country">
<option t-att-value="country.id" t-att-selected="country.id == checkout.get('shipping_country_id')"><t t-esc="country.name"/></option>
</div>
<div t-attf-class="form-group #{error.get('shipping_state_id') and 'has-error' or ''} col-lg-6">
<label class="control-label" for="shipping_state_id" style="font-weight: normal">State / Province</label>
- <select name="shipping_state_id" class="form-control">
+ <select name="shipping_state_id" class="form-control" t-att-readonly=" 'readonly' if shipping_id >= 0 else ''">
<option value="">State / Province...</option>
<t t-foreach="states or []" t-as="state">
<option t-att-value="state.id" style="display:none;" t-att-data-country_id="state.country_id.id" t-att-selected="state.id == checkout.get('shipping_state_id')"><t t-esc="state.name"/></option>
</select>
</div>
</div>
- <a href="/shop/cart" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Return to Cart</a>
- <a class="btn btn-default btn-primary pull-right mb32 a-submit">Confirm <span class="fa fa-long-arrow-right"/></a>
+ <div class="clearfix">
+ <a href="/shop/cart" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Return to Cart</a>
+ <a class="btn btn-default btn-primary pull-right mb32 a-submit">Confirm <span class="fa fa-long-arrow-right"/></a>
+ </div>
</div>
<div class="col-lg-offset-1 col-lg-3 col-md-3 text-muted">
<h3 class="page-header mt16">Your Order <small><a href="/shop/cart"><span class="fa fa-arrow-right"/> change</a></small></h3>
<template id="payment">
<t t-call="website.layout">
- <t t-set="head">
- <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
- <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
- <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
- <t t-raw="head or ''"/>
- </t>
<t t-set="additional_title">Shop - Select Payment Mode</t>
<div id="wrap">
<div class="container oe_website_sale">
</ul>
<h1 class="mb32">Validate Order</h1>
<div class="row">
+ <div class="col-lg-8 col-sm-9">
+ <t t-foreach="errors" t-as="error">
+ <div class="alert alert-danger" t-if="error">
+ <h4><t t-esc="error[0]"/></h4>
+ <t t-esc="error[1]"/>
+ </div>
+ </t>
+ </div>
<div class="col-lg-8 col-sm-9 oe_cart">
<t t-set="website_sale_order" t-value="website.sale_get_order()"/>
<table class='table table-striped table-condensed' id="cart_products" t-if="website_sale_order and website_sale_order.website_order_line">
<div>
<a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
</div>
- <t groups="sale.group_delivery_invoice_address">
+ <t>
<h4 class="mt32">Ship To:</h4>
<t t-if="website_sale_order.partner_shipping_id and website_sale_order.partner_shipping_id.id != website_sale_order.partner_invoice_id.id">
<div t-field="order.partner_shipping_id" t-field-options='{
<template id="confirmation">
<t t-call="website.layout">
- <t t-set="head">
- <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
- <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
- <t t-raw="head or ''"/>
- </t>
<t t-set="additional_title">Shop - Confirmed</t>
<div id="wrap">
<div class="container oe_website_sale">
<h2>Thank you for your order.</h2>
<div class="oe_website_sale_tx_status" t-att-data-order-id="order.id">
</div>
+ <h3 class="mt32"><strong>Order Details:</strong></h3>
+ <table class="table">
+ <thead>
+ <tr>
+ <th>Products</th>
+ <th>Quantity</th>
+ <th class="text-right" width="100">Unit Price</th>
+ <th class="text-right" width="100">Subtotal</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr t-foreach="order.order_line" t-as="line">
+ <td>
+ <div>
+ <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
+ <strong t-esc="line.product_id.name_get()[0][1]"/>
+ </a>
+ </div>
+ <div class="text-muted" t-field="line.name"/>
+ </td>
+ <td>
+ <div id="quote_qty">
+ <span t-field="line.product_uom_qty"/>
+ <span t-field="line.product_uom"/>
+ </div>
+ </td>
+ <td>
+ <strong class="text-right">
+ <div t-field="line.price_unit"
+ t-field-options='{"widget": "monetary", "display_currency": "order.pricelist_id.currency_id"}'/>
+ </strong>
+ </td>
+ <td>
+ <div class="text-right"
+ t-field="line.price_subtotal"
+ t-field-options='{"widget": "monetary", "display_currency": "order.pricelist_id.currency_id"}'/>
+ </td>
+ </tr>
+ <tr>
+ <td></td><td></td>
+ <td class="text-right"><strong>Total:</strong></td>
+ <td class="text-right">
+ <strong t-field="order.amount_total"
+ t-field-options='{"widget": "monetary", "display_currency": "order.pricelist_id.currency_id"}'/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
<div class="clearfix"/>
<div class="oe_structure"/>
</div>
"widget": "contact",
"fields": ["address", "name", "phone", "email"]
}'/>
- <t groups="sale.group_delivery_invoice_address">
+ <t>
<h4 class="mt32">Ship To:</h4>
<t t-if="order.partner_shipping_id and order.partner_shipping_id.id != order.partner_invoice_id.id">
<div t-field="order.partner_shipping_id" t-field-options='{
</table>
</template>
+<template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
+ <xpath expr="//footer" position="inside">
+ <div class="container mt16 mb8">
+ <div class="pull-right" t-ignore="true" t-if="not editable">
+ Powered by <a class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>,
+ the #1 <a href="http://www.odoo.com/page/e-commerce">Open Source eCommerce</a>.
+ </div>
+ <div class="pull-left text-muted">
+ Copyright &copy; <span t-field="res_company.name">Company name</span>
+ </div>
+ </div>
+ </xpath>
+</template>
+
+
+<!-- User Navbar -->
+<template id="content_new_product" inherit_id="website.user_navbar" groups="base.group_sale_manager">
+ <xpath expr="//ul[@id='oe_systray']/li/ul[@class='dropdown-menu oe_content_menu']" position="inside">
+ <li><a id="create-new-product" href="#" data-action="new_product">New Product</a></li>
+ </xpath>
+</template>
+
</data>
</openerp>
projects / odoo / odoo.git / blobdiff