Merge branch 'release/3.4.2.3'

openlabs · Jun 9, 2015 · 04f726e · 04f726e
2 parents 65afe4c + 20b2494
commit 04f726e
Show file tree

Hide file tree

Showing 10 changed files with 556 additions and 482 deletions.
diff --git a/static/css/font-awesome.min.css b/static/css/font-awesome.min.css
diff --git a/static/fonts/FontAwesome.otf b/static/fonts/FontAwesome.otf
diff --git a/static/fonts/fontawesome-webfont.eot b/static/fonts/fontawesome-webfont.eot
diff --git a/static/fonts/fontawesome-webfont.svg b/static/fonts/fontawesome-webfont.svg
diff --git a/static/fonts/fontawesome-webfont.ttf b/static/fonts/fontawesome-webfont.ttf
diff --git a/static/fonts/fontawesome-webfont.woff b/static/fonts/fontawesome-webfont.woff
diff --git a/templates/webshop/base.jinja b/templates/webshop/base.jinja
@@ -549,6 +549,9 @@
                 removeFromCart(delUrl);
             }});
           });
+          $('#cart-subtotal').text(data.status.cart.untaxed_amount);
+          $('#cart-tax').text(data.status.cart.tax_amount);
+          $('#cart-total').text(data.status.cart.total_amount);
         });
       };
       var userDataCallbacks = $.Callbacks("");
@@ -585,17 +588,27 @@
           url: "{{ url_for('nereid.cart.add_to_cart') }}",
           data: {'quantity': new_quantity, 'product': product_element.val()}
         })
-        .success(function (result){
-          if (result.message == "OK"){
-            updatedCart();
+        .done(function(result){
+          updatedCart();
+          if (result.line){
+            $(".cart-message").removeClass("hidden").show();
+            var template = $("#cart-message").html();
+            $(".cart-add-msg").html(_.template(template, {'line': result.line}));
+            $(".cart-message").removeClass("hidden").show().delay(3000).fadeOut();
           }
         })
-        .done(function(result){
-          $(".cart-message").removeClass("hidden").show();
-          var template = $("#cart-message").html();
-          console.log(result.line);
-          $(".cart-add-msg").html(_.template(template, {'line': result.line}));
-          $(".cart-message").removeClass("hidden").show().delay(3000).fadeOut();
+        .fail(function (result){
+          var obj = JSON.parse(result.responseText);
+          $.pnotify({
+            title: 'Alert',
+            text: obj.message,
+            type: 'error',
+            history: false,
+            nonblock: true,
+            delay:2000,
+            nonblock_opacity: .4,
+            animation: 'show'
+          });
         });
       });
     </script>

diff --git a/templates/webshop/cart/sale-line.jinja b/templates/webshop/cart/sale-line.jinja
@@ -1,7 +1,7 @@
 {% set currency = line.sale.currency.code %}
 
 {% if purpose == 'summary' %}
-<tr>
+<tr id="line-{{ line.id }}">
   <td class="hidden-xs hidden-sm">
     <a href="{{ url_for('product.product.render', uri=line.product.uri) }}">
       <img src="{{ line.product.default_image.transform_command().thumbnail(100, 100, 'a') }}" alt="{{ line.product.name }}">
@@ -19,7 +19,7 @@
     </td>
 </tr>
 {% else %}
-<tr>
+<tr id="line-{{ line.id }}">
   <td>
     <a href="{{ url_for('product.product.render', uri=line.product.uri) }}">
       <img src="{{ line.product.default_image.transform_command().thumbnail(100, 100, 'a') }}" alt="{{ line.product.name }}">

diff --git a/templates/webshop/shopping-cart.jinja b/templates/webshop/shopping-cart.jinja
@@ -42,7 +42,7 @@
           <div class="row">
             {% block shopping_cart_table scoped %}
             <div class="col-md-12">
-              <table class="table">
+              <table class="table cart-details">
                 <thead>
                   <tr>
                     <th></th>
@@ -104,15 +104,15 @@
                   <table class="table text-right table-borderless">
                     <tr>
                       <td>{{ _('Subtotal') }}</td>
-                      <td>{{ cart.sale.untaxed_amount|currencyformat(currency) }}</td>
+                      <td id="cart-subtotal">{{ cart.sale.untaxed_amount|currencyformat(currency) }}</td>
                     </tr>
                     <tr>
                       <td>{{ _('Estimated Tax') }}</td>
-                      <td>{{ cart.sale.tax_amount|currencyformat(currency) }}</td>
+                      <td id="cart-tax">{{ cart.sale.tax_amount|currencyformat(currency) }}</td>
                     </tr>
                     <tr>
                       <td class="cart-total-sum">{{ _('Grand Total') }}</td>
-                      <td class="cart-total-sum">{{ cart.sale.total_amount|currencyformat(currency) }}</td>
+                      <td class="cart-total-sum" id="cart-total">{{ cart.sale.total_amount|currencyformat(currency) }}</td>
                     </tr>
                   </table>
                 </div>

diff --git a/tryton.cfg b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.2.2
+version=3.4.2.3
 depends:
     nereid
     nereid_cms