<!-- Layout add nav and footer -->
+ <template id="website.secure_layout">
+ <xpath expr="//t[@id='editable_scripts_hook']" position="inside">
+ <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js" t-ignore="true"></script>
+ <script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js" t-ignore="true"></script>
+ </xpath>
+ </template>
+
<template id="header" inherit_id="website.layout" name="Header Shop My Cart Link">
<xpath expr="//header//ul[@id='top_menu']/li" position="before">
<li t-att-class="(not website_sale_order or not website_sale_order.get_total_quantity()) and 'hidden' or ''">
<a href="/shop/mycart/">
- <i class="icon-shopping-cart"></i>
+ <i class="fa fa-shopping-cart"></i>
My cart <sup t-attf-class="my_cart_quantity label label-primary"
t-esc="website_sale_order and website_sale_order.get_total_quantity() or ''"/>
</a>
</li>
</xpath>
- <xpath expr="//head" position="inside">
- <t t-if="editable">
- <script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js"></script>
- </t>
- </xpath>
</template>
<!-- List of categories -->
<template id="categories_recursive" name="Category list">
<li t-att-class="str(category.id) == search.get('category') and 'active' or ''">
- <a t-att-class="category.id not in categ[1] and 'unpublish' or ''" t-href="/shop/?category=#{ category.id }" t-field="category.name" t-keep-query="search,facettes"></a>
+ <a t-href="/shop/category/#{ category.id }/" t-field="category.name"></a>
<ul t-if="category.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
<t t-foreach="category.child_id" t-as="category">
- <t t-if="category.id in categ[1] or editable">
- <t t-call="website_sale.categories_recursive"/>
- </t>
+ <t t-call="website_sale.categories_recursive"/>
</t>
</ul>
</li>
<template id="search" name="Search hidden fields">
<input type="hidden" name="category" t-att-value="search.get('category') or ''"/>
- <input type="hidden" name="filter" t-att-value="search.get('filter') or ''"/>
+ <input type="hidden" name="filter_domain" t-att-value="search.get('filter_domain') or ''"/>
<input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
</template>
<template id="products_cart" name="Shopping cart">
- <div class="ribbon-wrapper" contentEditable="false">
- <div class="ribbon"><span contentEditable="true">Promo</span></div>
+ <div class="ribbon-wrapper">
+ <div class="ribbon">Promo</div>
</div>
<div class="oe_product_description">
- <a t-href="/shop/product/#{ product.id }/" t-keep-query="category,search,facettes">
+ <a t-href="/shop/product/#{ slug(product) }/" t-keep-query="category,search,filter_domain">
<b t-field="product.name"/>
</a>
</div>
</b>
</div>
<div class="oe_product_image text-center">
- <a t-href="/shop/product/#{ product.id }/" t-keep-query="category,search,facettes">
+ <a t-href="/shop/product/#{ product.id }/" t-keep-query="category,search,filter_domain">
<span t-field="product.image" t-field-options='{"widget": "image"}'/>
</a>
</div>
<div class="oe_structure"/>
<div class="container oe_website_sale">
<div class="row">
- <div class="col-sm-4 pagination hidden-xs" style="padding-left: 15px;">
- <form t-if="editable" t-keep-query="category,search,facettes"
- method="POST" t-action="/shop/add_product">
- <button class="btn btn-primary">New Product</button>
- </form>
- </div>
<div class="col-sm-8 products_pager">
<t t-call="website.pager">
<t t-set="classname">pull-right</t>
<div class='style_default row'>
<div class="hidden" id="products_grid_before"></div>
<div class="col-md-12" id="products_grid">
- <t t-if="product_ids">
<table width="100%">
<tbody>
- <t t-set="table_products" t-value="Ecommerce.get_bin_packing_products(product_ids, product_ids_for_holes, 4)"/>
- <tr t-foreach="table_products" t-as="tr_product">
+ <tr t-foreach="bins" t-as="tr_product">
<t t-foreach="tr_product" t-as="td_product">
<t t-if="td_product">
<t t-set="product" t-value="td_product['product']"/>
<div class="oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
- <div class="css_options" t-ignore="true" t-if="has_access_write">
+ <div class="css_options" t-ignore="true" t-if="editable">
<div t-attf-class="dropdown js_options" t-att-data-id="product.id">
<a class="btn btn-default" t-att-id="'dopprod-%s' % product.id" role="button" data-toggle="dropdown">Options <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % product.id">
</tr>
</tbody>
</table>
- </t>
- <t t-if="not product_ids">
+ <t t-if="not bins">
<h3 class="text-center text-muted">No product found for this search</h3>
</t>
</div>
<template id="add_to_basket" inherit_option_id="website_sale.products_cart" name="Add to Cart">
<xpath expr="//div[@class='product_price']" position="inside">
- <a t-href="./add_cart/?product_id=#{ product.id }" class="js_add_cart_json">
- <span class="icon-shopping-cart"/>
+ <a t-href="/shop/add_cart/#{ product.product_variant_ids[0].id }/" class="js_add_cart_json">
+ <span class="fa fa-shopping-cart"/>
</a>
</xpath>
</template>
<template id="list_view" inherit_option_id="website_sale.products" name="List View">
<xpath expr="//div[@id='products_grid']//table" position="replace">
<div class="row">
- <t t-set="products" t-value="Ecommerce.get_products(product_ids)"/>
<t t-foreach="products" t-as="product">
<div class="col-md-12 oe_list_products oe-height-1">
<t t-call="website_sale.products_cart"/>
<div class="col-sm-5">
<ol class="breadcrumb">
<li><a href="/shop">Products</a></li>
- <li t-if="search.get('category')"><a t-href="/shop/" t-keep-query="category,search,facettes"><span t-field="category.name"/></a></li>
- <li class="active"><span t-field="product.name"></span></li>
+ <li t-if="search.get('category')"><a t-href="/shop/" t-keep-query="category,search,filter_domain"><span t-field="category.name"/></a></li>
+ <li class="active"><span t-field="product.name"/></li>
</ol>
</div><div class="col-sm-3">
<t t-call="website.publish_management">
</div><div class="col-sm-5 col-md-5 col-lg-4 col-lg-offset-1">
<h1 t-field="product.name">Product Name</h1>
- <form action="./add_cart/" class="js_add_cart_json">
+ <form action="/shop/add_cart/" class="js_add_cart_json" method="POST">
<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">
<div class="product_price mt16" t-if="product.product_variant_ids">
<h4>
- <b><span class="oe_price" t-esc="product.product_variant_ids[0].price" /> €</b>
-
<t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
- <span class="text-danger" style="text-decoration: line-through;">
- <t t-esc="product.product_variant_ids[0].lst_price" /> €
- </span>&nbsp;
+ <span class="text-danger" style="text-decoration: line-through;"
+ t-field="product.product_variant_ids[0].lst_price"
+ t-field-options='{
+ "widget": "monetary",
+ "display_currency": "website.pricelist_id.currency_id"
+ }'/><br/>
</t>
+ <b class="oe_price"
+ t-field="product.product_variant_ids[0].price"
+ t-field-options='{
+ "widget": "monetary",
+ "display_currency": "website.pricelist_id.currency_id"
+ }'/>
</h4>
</div>
<button class="btn btn-primary btn-lg mt8">Add to Cart</button>
<div class='mt16 text-center'>
<span t-field="product.image_small"/>
<h5>
- <a t-href="/shop/product/#{ product.id }/"
+ <a t-href="/shop/product/#{ slug(product) }/"
style="display: block">
<span t-field='product.name'
style="display: block"/>
</ul>
<h1 class="mb32">Shopping Cart</h1>
<div class="row">
- <div class="col-md-8 col-md-offset-1 oe_mycart">
+ <div class="col-md-8 col-sm-9 oe_mycart">
<div t-if="not website_sale_order or not website_sale_order.order_line" class="well well-lg">
Your cart is empty!
</div>
</td>
<td t-if="line.product_id.product_tmpl_id">
<div>
- <a t-href="/shop/product/#{ line.product_id.product_tmpl_id.id }/">
+ <a t-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
<strong t-field="line.product_id.name"/>
+ <t t-if="line.product_id.variants">(<t t-esc="line.product_id.variants"/>)</t>
</a>
</div>
<div class="text-muted" t-field="line.product_id.description_sale"/>
<td>
<div class="input-group">
<span class="input-group-addon">
- <a t-href="./add_cart/?remove=True&order_line_id=#{ line.id }" class="mb8 js_add_cart_json">
- <span class="icon-minus"/>
+ <a t-href="./change_cart/#{ line.id }/?remove=True" class="mb8 js_add_cart_json">
+ <i class="fa fa-minus-square"></i>
</a>
</span>
<input type="text" class="js_quantity form-control"
t-att-data-id="line.id" t-att-value="int(line.product_uom_qty)"/>
<span class="input-group-addon">
- <a t-href="./add_cart/?order_line_id=#{ line.id }" class="mb8 float_left js_add_cart_json">
- <span class="icon-plus"/>
+ <a t-href="./change_cart/#{ line.id }/" class="mb8 float_left js_add_cart_json">
+ <i class="fa fa-plus-square"></i>
</a>
</span>
</div>
</thead>
</table>
<div class="clearfix"/>
- <a href="/shop" class="btn btn-default mb32"><span class="icon-long-arrow-left"/> Continue Shopping</a>
- <a t-if="website_sale_order and website_sale_order.order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="icon-long-arrow-right"/></a>
+ <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
+ <a t-if="website_sale_order and website_sale_order.order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
<div class="oe_structure"/>
</div>
- <div class="col-md-3 text-muted" id="right_column">
+ <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
<h4>Policies</h4>
<ul class="list-unstyled mb32">
<li>☑ 30-days money-back guarantee</li>
<xpath expr="//div[@id='products_grid_before']" position="inside">
<ul class="nav nav-pills nav-stacked mt16">
<li t-att-class=" '' if search.get('category') else 'active' "><a href="/shop/">All Products</a></li>
- <t t-set="categ" t-value="Ecommerce.get_categories()"/>
- <t t-foreach="categ[0]" t-as="category">
+ <t t-foreach="categories" t-as="category">
<t t-call="website_sale.categories_recursive"/>
</t>
</ul>
<template id="products_attributes" inherit_option_id="website_sale.products" name="Product Filters and Attributes">
<xpath expr="//div[@id='products_grid_before']" position="inside">
- <form t-action="/shop/filter/" method="post" t-keep-query="category,search,add_filter">
+ <form t-action="/shop/filter/" method="post" t-keep-query="category,search">
<ul class="nav nav-pills nav-stacked mt16">
<t t-set="attribute_ids" t-value="Ecommerce.get_attribute_ids()"/>
<t t-foreach="attribute_ids" t-as="attribute_id">
<tr t-foreach="suggested_products" t-as="product">
<td>
- <a t-href="/shop/product/#{ product.product_tmpl_id.id }/">
+ <a t-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
<span t-field="product.image_small"
t-field-options='{"widget": "image", "class": "img-rounded"}'/>
</a>
</td>
<td>
<div>
- <a t-href="/shop/product/#{ product.product_tmpl_id.id }/">
+ <a t-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
<strong t-field="product.name"/>
</a>
</div>
}'/>
</td>
<td class="text-center">
- <a t-href="./add_cart/?product_id=#{ product.id }"><strong>Add to Cart</strong></a>
+ <a t-href="./add_cart/#{ product.id }/"><strong>Add to Cart</strong></a>
</td>
</tr>
</tbody>
</select>
</div>
</div>
- <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="icon-long-arrow-right"/></button>
+ <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="fa fa-long-arrow-right"/></button>
</div>
<div class="col-lg-offset-1 col-lg-3 text-muted">
- <h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="icon-arrow-right"/> change</a></small></h3>
+ <h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="fa fa-arrow-right"/> change</a></small></h3>
<div class="row">
<div class="col-sm-6 text-right">Subtotal:</div>
<div class="col-sm-6"><span t-esc="website_sale_order.amount_untaxed" t-field-options='{
<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>
</ul>
<h1 class="mb32">Validate Order</h1>
<div class="row">
- <div class="col-md-8 oe_mycart">
+ <div class="col-lg-8 col-sm-9 oe_mycart">
<table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.order_line">
<colgroup>
<col width="80"/>
<tr t-foreach="website_sale_order.order_line" t-as="line">
<td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
<td t-if="line.product_id.product_tmpl_id">
- <a t-href="/shop/product/#{ line.product_id.product_tmpl_id.id }/">
+ <a t-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
<span t-field="line.product_id.image_small"
t-field-options='{"widget": "image", "class": "img-rounded"}'/>
</a>
}'/></h3></th>
</tr>
<tr class="text-muted">
- <td><abbr title="Taxes may be updated after providing shipping address">Incl. Taxes:</abbr></td>
+ <td>Incl. Taxes:</td>
<td class="text-right"><span t-field="website_sale_order.amount_tax" t-field-options='{
"widget": "monetary",
"display_currency": "website.pricelist_id.currency_id"
<div class="clearfix"/>
<div class="oe_structure"/>
</div>
- <div class="col-md-3 col-md-offset-1 text-muted" id="right_column">
+ <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
<h4>Bill To:</h4>
<div t-field="website_sale_order.partner_invoice_id"/>
<div>
- <a href="/shop/checkout"><span class="icon-arrow-right"/> Change Address</a>
+ <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
</div>
<h4 class="mt32">Ship To:</h4>
<div t-field="website_sale_order.partner_shipping_id"/>
<div>
- <a href="/shop/checkout"><span class="icon-arrow-right"/> Change Address</a>
+ <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
</div>
</div>
</div>
- <div class="js_payment mb64">
- <p>Select your payment method:</p>
- <div>
+ <div class="js_payment mb64" t-if="not payment_acquirer_id and payments" id="payment_method">
+ <h3>Choose your payment method</h3>
+ <div class="col-lg-5 col-sm-6">
<t t-foreach="payments or []" t-as="payment">
- <label>
- <input t-att-value="payment.id" type="radio" name="payment_type"/> <t t-esc="payment.name"/>
+ <label t-if="payment._content">
+ <input t-att-value="payment.id" type="radio" name="payment_type"/> <span t-field="payment.name"/>
</label>
</t>
+ <t t-foreach="payments" t-as="payment">
+ <div t-att-data-id="payment.id" t-raw="payment._content" class="oe_payment_acquirer hidden"/>
+ </t>
+ </div>
+ <div class="col-lg-3 col-sm-3">
+ <button class="btn btn-primary pull-right">Pay Now !!!</button>
+ </div>
+ </div>
+
+ </div>
+ <div class="oe_structure"/>
+ </div>
+
+ </t>
+ </template>
+
+ <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">
+
+ <ul class="wizard pull-right">
+ <li class="text-muted">Review Order<span class="chevron"></span></li>
+ <li class="text-muted">Shipping & Billing<span class="chevron"></span></li>
+ <li class="text-muted">Payment<span class="chevron"></span></li>
+ <li class="text-primary">Confirmation<span class="chevron"></span></li>
+ </ul>
+ <h1 class="mb32">Order Confirmed</h1>
+ <div class="row">
+ <div class="col-md-8 oe_mycart">
+ <h2>Thank you for your order.</h2>
+ <div class="oe_website_sale_tx_status" t-att-data-order-id="order.id">
+ </div>
+ <div class="clearfix"/>
+ <div class="oe_structure"/>
+ </div>
+ <div class="col-md-3 col-md-offset-1 text-muted" id="right_column">
+ <h4>Bill To:</h4>
+ <div t-field="order.partner_invoice_id"/>
+
+ <h4 class="mt32">Ship To:</h4>
+ <div t-field="order.partner_shipping_id"/>
+
+ <h4 class="mt32">Amount:</h4>
+ <!--<div t-field="order.amount_total" t-field-options='{
+ "widget": "monetary",
+ "display_currency": "website.pricelist_id.currency_id"
+ }'/> -->
</div>
- <t t-foreach="payments or []" t-as="payment">
- <div t-att-data-id="payment.id" t-raw="payment._content" class="hidden"/>
- </t>
- <a href="/shop/payment_validate/" class="btn btn-primary mt16">Validate & Pay <span class="icon-long-arrow-right"/></a>
</div>
</div>
projects / odoo / odoo.git / blobdiff