From d8516bcfd82f3d2e7b61bf2739f253eece5a3b6a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Fri, 13 Jun 2014 12:47:54 +0200
Subject: [PATCH] [IMP] website_sale: optional quantity in product form

---
 .../static/src/js/website_sale.js             |  7 +++--
 addons/website_sale/views/templates.xml       | 26 ++++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 995c921bd4f..f624eed5f50 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -38,8 +38,11 @@ $(document).ready(function () {
         ev.preventDefault();
         var $link = $(ev.currentTarget);
         var $input = $link.parent().parent().find("input");
+        var min = parseFloat($input.data("min") || 0);
+        var max = parseFloat($input.data("max") || Infinity);
         var quantity = ($link.has(".fa-minus").length ? -1 : 1) + parseFloat($input.val(),10);
-        $input.val(quantity > 0 ? quantity : 0);
+        $input.val(quantity > min ? (quantity < max ? quantity : max) : min);
+        $('input[name="'+$input.attr("name")+'"]').val(quantity > min ? (quantity < max ? quantity : max) : min);
         $input.change();
         return false;
     });
@@ -134,7 +137,7 @@ $(document).ready(function () {
         event.preventDefault();
         var $link = $(this);
         var $form = $link.parents("form:first");
-        var quantity = parseInt($('input[name="add_qty"]').val() || 1, 10);
+        var quantity = parseInt($('input[name="add_qty"]:last').val() || 1, 10);
         var defs = [];
         $link.attr('disabled', 'disabled');
         $('.js_product', $form).each(function () {
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 4a1a2f4c649..d21feefc9c7 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -533,12 +533,14 @@
   </t>
 </template>
 
-<template id="product_confirmation" inherit_id="website_sale.product" optional="enabled" name="Confirm: Add To Cart">
+<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">
-    <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 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>
   <xpath expr="//t[@t-set='option_inc'][@t-value='0']" position="before">
     <tr>
@@ -572,7 +574,7 @@
                     <i class="fa fa-minus"></i>
                 </a>
             </span>
-            <input type="text" class="js_quantity form-control" name="add_qty" value="1"/>
+            <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>
@@ -584,6 +586,24 @@
   </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="input-group" style="width: 108px;">
+        <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>
+  </xpath>
+</template>
+
 <template id="product_price">
   <div itemprop="offers" itemscope="itemscope" itemtype="http://schema.org/Offer" class="product_price mt16">
       <h4 class="oe_price_h4">