Async cart recap enhancements

Gemfile.lock

@@ -20,7 +20,7 @@ GIT
 PATH
   remote: .
   specs:
-    glysellin (0.3.alpha)
+    glysellin (0.3.1)
       activemerchant
       country_select
       money
@@ -48,7 +48,7 @@ GEM
     active_utils (1.0.5)
       activesupport (>= 2.3.11)
       i18n
-    activemerchant (1.29.3)
+    activemerchant (1.31.1)
       active_utils (>= 1.0.2)
       activesupport (>= 2.3.14)
       builder (>= 2.0.0)
@@ -83,7 +83,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
-    country_select (1.0.1)
+    country_select (1.1.3)
     devise (2.1.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -114,7 +114,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    money (5.1.0)
+    money (5.1.1)
       i18n (~> 0.6.0)
     multi_json (1.5.0)
     mysql2 (0.3.11)
@@ -162,7 +162,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    simple_form (2.0.4)
+    simple_form (2.1.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     sprockets (2.2.2)

README.md

@@ -57,7 +57,7 @@ end
 To display the cart you must render it's partial in your layout :
 
 ```erb
-<%= render partial: "glysellin/cart/cart", locals: { cart: @cart } %>
+<%= render_cart(@cart) %>
 ```
 
 ### Filling the cart

app/assets/javascripts/glysellin/cart-recap.coffee

@@ -1,4 +1,4 @@
-class CartRecap
+class AsyncCart
   constructor: (@container) ->
     @defaultPostOptions = {
       _method: @container.find('input[name="_method"]').val(),
@@ -46,10 +46,10 @@ class CartRecap
     @adjustmentRow.find('.remove-discount-btn').on 'click', (e) =>
       @resetDiscountCode(); false
 
-    @container.on "submit", (e, force = false) ->
-      false unless force
+    @container.on "submit", (e, force = false) -> console.log("tuff"); force
 
-    @container.find("#submit-order").on "click", (e) =>
+    @container.find("[name=submit_order]").on "click", (e) =>
+      console.log(e)
       if e.clientX != 0 && e.clientY != 0
         @container.trigger("submit", [true])
 
@@ -121,6 +121,9 @@ class CartRecap
     @totals.eot.text(totals.total_eot_price)
     @totals.total.text(totals.total_price)
 
-
-$ ->
-  new CartRecap($('.products-recap-form.editable'))
+$.fn.glysellinAsyncCart = (options = {})->
+  @each ->
+    $cart = $(this)
+    data = $cart.data('glysellin.async-cart')
+    unless data
+      $cart.data('glysellin.async-cart', new AsyncCart($cart, options))

app/helpers/glysellin/cart_helper.rb

@@ -13,5 +13,9 @@ def add_to_cart_form product, options = {}
     def added_to_cart_warning
       render partial: 'glysellin/cart/added_to_cart_warning'
     end
+
+    def render_cart cart
+      render partial: "glysellin/cart/cart", locals: { cart: cart }
+    end
   end
 end

app/views/glysellin/cart/_cart.html.erb

@@ -1,9 +1,11 @@
-<div class="cart-container warn">
-  <% if cart.empty? %>
-    <%= t('glysellin.labels.cart.no_products_in_cart') %>
-  <% else %>
-    <%= t('glysellin.labels.cart.products_count', count: cart.products_total) %>
-
-    <%= link_to t('glysellin.labels.cart.create_order'), cart_path %>
-  <% end %>
+<div class="cart-wrapper">
+  <div class="cart-container warn">
+    <% if cart.empty? %>
+      <%= t('glysellin.labels.cart.no_products_in_cart') %>
+    <% else %>
+      <%= t('glysellin.labels.cart.products_count', count: cart.products_total) %>
+      -
+      <%= link_to t('glysellin.labels.cart.create_order'), cart_path %>
+    <% end %>
+  </div>
 </div>

app/views/glysellin/cart/_products.html.erb

@@ -1,8 +1,8 @@
 <% editable = false unless defined?(editable) && editable == true %>
-<% remote = false unless defined?(remote) && remote == true %>
+<% remote = Glysellin.async_cart %>
 
 <%= form_tag update_cart_path, method: "put", class: "products-recap-form#{ ' editable' if editable }" do %>
-  <table id="order_recap_table" class="table">
+  <table id="order_recap_table" class="table table-bordered table-striped">
     <tr>
       <th><%= t('glysellin.labels.order.sku') %></th>
       <th><%= t('glysellin.labels.order.name') %></th>
@@ -98,13 +98,21 @@
       <td class="total-price">
         <%= number_to_currency(cart.total_price) %>
       </td>
+      <% if editable %>
+        <td></td>
+      <% end %>
     </tr>
   </table>
 
   <% if editable %>
     <div class="discount-code">
       <%= label_tag :discount_code, t('glysellin.labels.order.discount_code') %>
       <%= text_field_tag :discount_code, cart.discount_code %>
+      <% if remote %>
+        <button class="update-discount-code-btn" type="button">
+          <%= t('glysellin.labels.cart.update_discount') %>
+        </button>
+      <% end %>
     </div>
     <% unless remote %>
       <!-- Update cart contents -->

app/views/glysellin/products/show.html.erb

@@ -0,0 +1,7 @@
+<% if @product.variants.length > 1 %>
+  <% @product.variants.each do |variant| %>
+    <%= variant.name(false) %>
+  <% end %>
+<% end %>
+
+<%= add_to_cart_form(@product) %>

config/locales/glysellin.en.yml

@@ -30,7 +30,7 @@ en:
         order_reference: "Order reference"
         sku: "SKU"
         name: "Product name"
-        eot_price: "Duty Free Price"
+        eot_price: "Excluding VAT price"
         price: "Price"
         subtotal: "Sub-total"
         shipping: "Shipping"
@@ -68,6 +68,7 @@ en:
         remove_from_cart: "Delete"
         update: "Update cart"
         update_discount: "Update discount code"
+        create_order_form: "Submit order"
     orders:
       states:
         created: "Created"