tb_checkout 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72b41d203ad250ac03a6ff8dfdb7742c2a2b5e95
-  data.tar.gz: 7aed0b974b9c4f816c18c355835fb558e3dc7c0b
+  metadata.gz: 9e3560014c484a57a52918acaaf59787824300d7
+  data.tar.gz: 3cda17fad3ef8bc01f1d082046bac3a7d4e66754
 SHA512:
-  metadata.gz: 55daefc75b862d7af121583ac3f3e77a503745fcd136cbe42288602fe7596ef13c1f79e4302e34850288ac9ff647df98d2eb2ac19829586f3f06a0612018539b
-  data.tar.gz: fbf80bdfb59d06bfca9d6b02fe6d37c10f14e8f0516b111996be345e2d7ed7112257277db1786874a52f1e5995f7940e35fe0835e6f35d14dc42897bdcc7a1b2
+  metadata.gz: ebe45ae6b8648965a8b9a316af4d468e01099294969f921b1d6d7638e49534371f06c45bce6bf5ec336532d596ba70686631c4760edb106df31915f87ecca48d
+  data.tar.gz: c9aad41fc87e1ded077830875aeddb2176300cc152ff892b4f9ce44347dfe426c704d96e9bf29585b6775a1b8e27e6494288dc8f405ac0a9b6cfcacec856d243

data/app/models/tb_checkout/transaction.rb

@@ -136,6 +136,14 @@ module TbCheckout
       end
     end
 
+    def response_json
+      begin
+        return JSON.parse(response_text)
+      rescue JSON::ParseError
+        return {}
+      end
+    end
+
 private
 
     def void!

data/app/views/tb_checkout/admin/transactions/_table.html.erb

@@ -1,22 +1,22 @@
 <div class="table-responsive">
   <table class="table table-striped table-hover">
     <thead>
-      <th>Invoice Number</th>
       <th>Transaction ID</th>
       <th>Billing Name</th>
       <th>Card</th>
       <th>Amount Charged</th>
+      <th>Date</th>
       <th>Status</th>
       <th></th>
     </thead>
     <tbody>
       <% transactions.each do |transaction| %>
         <tr>
-          <td><%= transaction.invoice_num %></td>
           <td><%= transaction.gateway_transaction_id %></td>
           <td class="no-wrap"><%= transaction.billing_full_name %></td>
           <td class="no-wrap"><%= transaction.card_display %> (<%= transaction.card_type %>)</td>
           <td><%= number_to_currency transaction.amount_charged %></td>
+          <td><%= transaction.created_at.strftime('%D %-l:%M %p') %></td>
           <td><%= tb_checkout_status_label_for_transaction(transaction.status) %></td>
           <td><%= link_to 'Detail', tb_checkout_admin_transaction_path(transaction), :class => 'btn btn-sm btn-default' %></td>
         </tr>

data/app/views/tb_checkout/admin/transactions/index.html.erb

@@ -4,4 +4,5 @@
 
 <% content_for :detail do %>
   <%= render :partial => 'table', :locals => {:transactions => @transactions} %>
+  <%= will_paginate @transactions, :renderer => BootstrapPagination::Rails %>
 <% end %>

data/app/views/tb_checkout/admin/transactions/show.html.erb

@@ -8,6 +8,7 @@
         <th>Transaction ID</th>
         <th>Card</th>
         <th>Amount Charged</th>
+        <th>Date</th>
         <th>Status</th>
       </tr>
     </thead>
@@ -17,6 +18,7 @@
       <td><%= @transaction.gateway_transaction_id %></td>
       <td><%= @transaction.card_display %> (<%= @transaction.card_type %>)</td>
       <td><%= number_to_currency @transaction.amount_charged %></td>
+      <td><%= @transaction.created_at.strftime('%D %-l:%M %p') %></td>
       <td><%= tb_checkout_status_label_for_transaction(@transaction.status) %></td>
     </tbody>
   </table>
@@ -74,3 +76,7 @@
     </tfoot>
   </table>
 </div>
+
+<h3>API Response Text</h3>
+
+<%= debug @transaction.response_json %>

data/app/views/tb_checkout/carts/_cart.html.erb

@@ -1,65 +1,60 @@
 <% editable = true if local_assigns[:editable].nil? %>
 <% cart = local_assigns[:cart].nil? ? @cart : cart %>
 
-<% cache [cart, cart.cart_items, editable] do %>
-  <div class="table-responsive">
-    <table class="table tb-checkout-cart-table">
-      <thead>
-        <tr>
-          <th>Product</th>
-          <th>Quantity</th>
-          <th>Price</th>
-          <% if editable %>
-            <th></th>
-          <% end %>
-        </tr>
-      </thead>
-      <tbody>
-        <% cart.cart_items.each do |cart_item| %>
-          <% cache [cart, cart_item, editable] do %>
-            <tr class="tb-checkout-cart-row">
-              <td>
-                <% if cart_item.has_item_url? %>
-                  <%= link_to cart_item.item_description, cart_item.item_url(self) %>
-                <% else %>
-                  <%= cart_item.item_description %>
-                <% end %>
-                <% if cart.is_completed? && cart_item.has_detail_view? %>
-                  <div class="tb-checkout-cart-row-detail">
-                    <%= render :partial => cart_item.detail_view, :locals => {:item => cart_item.item} %>
-                  </div>
-                <% end %>
-              </td>
-              <td>
-                <% if editable && cart_item.item.class.quantity_is_editable %>
-                  <%= form_for cart_item, :html => {:class => 'tb-checkout-cart-item-update-form'} do |f| %>
-                    <%= f.number_field :quantity %>
-                    <%= f.submit 'Update', :class => 'btn btn-sm tb-checkout-cart-item-update-submit' %>
-                  <% end %>
-                <% else %>
-                  <%= cart_item.quantity %>
-                <% end %>
-              </td>
-              <td><%= number_to_currency cart_item.total_price %></td>
-              <td>
-                <% if editable %>
-                  <%= link_to 'Remove', tb_checkout_cart_item_path(cart_item), :method => :delete, :class => 'btn btn-sm btn-danger tb-checkout-cart-item-remove' %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
+<div class="table-responsive">
+  <table class="table tb-checkout-cart-table">
+    <thead>
+      <tr>
+        <th>Product</th>
+        <th>Quantity</th>
+        <th>Price</th>
+        <% if editable %>
+          <th></th>
         <% end %>
-      </tbody>
-      <tfoot>
-        <tr>
-          <td colspan="2">
-            Total
+      </tr>
+    </thead>
+    <tbody>
+      <% cart.cart_items.each do |cart_item| %>
+        <tr class="tb-checkout-cart-row">
+          <td>
+            <% if cart_item.has_item_url? %>
+              <%= link_to cart_item.item_description, cart_item.item_url(self) %>
+            <% else %>
+              <%= cart_item.item_description %>
+            <% end %>
+            <% if cart.is_completed? && cart_item.has_detail_view? %>
+              <div class="tb-checkout-cart-row-detail">
+                <%= render :partial => cart_item.detail_view, :locals => {:item => cart_item.item} %>
+              </div>
+            <% end %>
+          </td>
+          <td>
+            <% if editable && cart_item.item.class.quantity_is_editable %>
+              <%= form_for cart_item, :html => {:class => 'tb-checkout-cart-item-update-form'} do |f| %>
+                <%= f.number_field :quantity %>
+                <%= f.submit 'Update', :class => 'btn btn-sm tb-checkout-cart-item-update-submit' %>
+              <% end %>
+            <% else %>
+              <%= cart_item.quantity %>
+            <% end %>
+          </td>
+          <td><%= number_to_currency cart_item.total_price %></td>
+          <td>
+            <% if editable %>
+              <%= link_to 'Remove', tb_checkout_cart_item_path(cart_item), :method => :delete, :class => 'btn btn-sm btn-danger tb-checkout-cart-item-remove' %>
+            <% end %>
           </td>
-          <td><%= number_to_currency cart.total_price %></td>
-          <td></td>
         </tr>
-      </tfoot>
-    </table>
-  <% end %>
-
+      <% end %>
+    </tbody>
+    <tfoot>
+      <tr>
+        <td colspan="2">
+          Total
+        </td>
+        <td><%= number_to_currency cart.total_price %></td>
+        <td></td>
+      </tr>
+    </tfoot>
+  </table>
 </div>

data/app/views/tb_checkout/carts/show.html.erb

@@ -1,10 +1,8 @@
 <h1>My Cart</h1>
 
-<% cache @cart do %>
-  <% if @cart.blank? || @cart.is_empty? %>
-    <p>Your shopping cart is currently empty.</p>
-  <% else %>
-    <%= render 'cart' %>
-    <p><%= link_to 'Check Out', new_tb_checkout_transaction_path, :class => 'btn btn-primary' %></p>
-  <% end %>
+<% if @cart.blank? || @cart.is_empty? %>
+  <p>Your shopping cart is currently empty.</p>
+<% else %>
+  <%= render 'cart' %>
+  <p><%= link_to 'Check Out', new_tb_checkout_transaction_path, :class => 'btn btn-primary' %></p>
 <% end %>

data/app/views/tb_checkout/transactions/new.html.erb

@@ -1,8 +1,6 @@
 <h1>Check Out</h1>
 
-<% cache @cart do %>
-  <%= render :partial => '/tb_checkout/carts/cart', :locals => {:editable => false, :cart => @cart} %>
-<% end %>
+<%= render :partial => '/tb_checkout/carts/cart', :locals => {:editable => false, :cart => @cart} %>
 
 <h2>Billing Info</h2>
 

data/app/views/tb_checkout/transactions/show.html.erb

@@ -3,12 +3,8 @@
 <p>Print this page for your records.</p>
 
 <h4>Your Order</h4>
-<% cache @transaction.cart do %>
-  <%= render :partial => '/tb_checkout/carts/cart', :locals => {:editable => false, :cart => @transaction.cart} %>
-<% end %>
+<%= render :partial => '/tb_checkout/carts/cart', :locals => {:editable => false, :cart => @transaction.cart} %>
 
-<% cache @transaction do %>
-  <%= render 'details' %>
-<% end %>
+<%= render 'details' %>
 
 <p><%= link_to 'View My Orders', tb_checkout_transactions_path %></p>

data/lib/tb_checkout/version.rb

@@ -1,3 +1,3 @@
 module TbCheckout
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_checkout
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tb_core