caboose-cms 0.5.64 → 0.5.66

data/app/views/caboose/orders/admin_edit_old.html.erb

@@ -0,0 +1,155 @@
+<%
+sa = @order.shipping_address
+shipping_address = sa.address1
+shipping_address << "<br />#{sa.address2}" if sa.address2 && sa.address2.length > 0
+shipping_address << "<br />#{sa.city}, #{sa.state} #{sa.zip}"
+captured = @order.financial_status == 'captured'
+%>
+<input type='hidden' name='order_id'    id='order_id'     value='<%= @order.id %>' />
+
+<h1>Edit Order #<%= @order.id %></h1>
+         
+<table class='data'>
+<tr>
+  <th><%= if @order.customer.nil? then 'Guest' else 'Customer' end %></th>
+  <th>Shipping Address</th>
+  <th>Shipping Method</th>
+  <th>Order Status</th>
+  <th>Payment Status</th>
+  <th>Transaction ID</th>
+</tr>
+<tr>
+  <td valign='top'>
+    <%= "#{@order.shipping_address.first_name} #{@order.shipping_address.last_name}" %><br />
+    <% if @order.customer %>
+      <a href="mailto:<%= "#{@order.customer.email}" %>"><%= "#{@order.customer.email}" %></a><br />
+    <% elsif @order.email %>
+      <a href="mailto:<%= @order.email %>"><%= @order.email %></a>
+    <% end %>
+    <%= @order.customer ? @order.customer.phone : @order.shipping_address.phone %>    
+  </td>
+  <td valign='top'>
+    <%= "#{@order.shipping_address.first_name} #{@order.shipping_address.last_name}" %><br />
+    <%= raw shipping_address %>
+  </td>
+  <td valign='top' align='center'>
+    <% if @order.shipping_service_code %>
+      <%= @order.shipping_carrier %> <%= @order.shipping_service_name %>
+    <% else %>
+      Multiple packages
+    <% end %>
+  </td>
+  <td valign='top'>
+    <div id='order_<%= @order.id %>_status'></div>
+  </td>
+  <td valign='top' align='center'>
+    <%= @order.financial_status %>
+    <% if @order.financial_status == 'authorized' %>
+    for<br /><%= number_to_currency(@order.auth_amount) %>
+    <% end %>
+  </td>
+  <td valign="top" align='center'><%= @order.transaction_id %></td>
+</tr>
+</table><br />
+
+<table class='data' width='100%'>
+<tr>
+  <th>Package</th>
+  <th>Item</th>
+  <th>Status</th>    
+  <th>Unit Price</th>
+  <th>Quantity</th>
+  <th>Subtotal</th>
+</tr>
+<% @order.packages.each do |op| %>  
+  <% op.line_items.each_with_index do |li, i| %>
+    <tr>
+      <% if i == 0 %>
+        <td rowspan="<%= op.line_items.count %>">
+          <div id='orderpackage_<%= op.id %>_shipping_method_id'></div>
+          <div id='orderpackage_<%= op.id %>_status'></div>    
+        </td>
+      <% end %>  
+      <td>
+        <% if li.variant.nil? || li.variant.product.nil? %>
+          <% if li.variant.nil? %>
+            Unknown variant
+          <% else %>
+            <%= li.variant.sku %>
+          <% end %>
+        <% else %>
+          <a href='/admin/products/<%= li.variant.product.id %>/variants?highlight=<%= li.variant.id %>'><%= li.variant.product.title  %></a><br />
+          <%= li.variant.sku            %><br />
+          <%= li.variant.title          %>
+        <% end %>
+      </td>
+      <td              ><div id='lineitem_<%= li.id %>_status'          ></div></td>      
+      <td align='right'><%= number_to_currency(li.variant.price) %></td>    
+      <td align='right'><% if captured %><%= li.quantity %><% else %><div id='lineitem_<%= li.id %>_quantity'></div><% end %></td>
+      <td align='right' id='li_<%= li.id %>_subtotal'><%= number_to_currency(li.price) %></td>
+    </tr>
+  <% end %>
+<% end %>
+<% @order.line_items.each do |li| %>   
+  <% next if li.order_package_id %>  
+  <tr>    
+    <td><div id='assign_to_package'>Unpackaged! <a href='#' onclick="assign_to_package_form(<%= li.id %>);">Assign to package</a></div></td>    
+    <td>
+      <% if li.variant.nil? || li.variant.product.nil? %>
+        <% if li.variant.nil? %>Unknown variant<% else %><%= li.variant.sku %><% end %>
+      <% else %>
+        <a href='/admin/products/<%= li.variant.product.id %>/variants?highlight=<%= li.variant.id %>'><%= li.variant.product.title  %></a><br />
+        <%= li.variant.sku            %><br />
+        <%= li.variant.title          %>
+      <% end %>
+    </td>
+    <td              ><div id='lineitem_<%= li.id %>_status'          ></div></td>    
+    <td align='right'><%= number_to_currency(li.variant.price) %></td>    
+    <td align='right'><% if captured %><%= li.quantity %><% else %><div id='lineitem_<%= li.id %>_quantity'></div><% end %></td>
+    <td align='right' id='li_<%= li.id %>_subtotal'><%= number_to_currency(li.price) %></td>
+  </tr>
+<% end %>
+<tr><td colspan='5' align='right'>Subtotal                </td><td align='right' id='subtotal'   ><%= number_to_currency(@order.subtotal ) %></td></tr>
+<tr><td colspan='5' align='right'>Tax                     </td><td align='right' id='tax'        ><%= number_to_currency(@order.tax      ) %></td></tr>
+<tr><td colspan='5' align='right'><%= @order.shipping_service_code ? @order.shipping_service_code : '' %> Shipping &amp; Handling </td><td align='right' id='shipping'><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
+<tr>
+  <td colspan='5' align='right'>Discount</td>
+  <td align='right'>
+    <% if captured && @order.discounts.any? %>
+      <%= number_to_currency(@order.amount_discounted || 0) %>
+    <% elsif @order.discounts.any? %>
+      <%= number_to_currency(@order.discounts.first.amount_current) %>
+    <% else %>
+      $0.00
+    <% end %>
+  </td>
+</tr>
+<tr><td colspan='5' align='right'>Total                   </td><td align='right' id='total'      ><%= number_to_currency(@order.total    ) %></td></tr>
+</table>
+<div id='message'></div>
+
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/orders';" />
+<% if @order.financial_status == 'authorized' %>
+  <input type='button' value='Capture Funds' onclick="capture_funds(<%= @order.id %>);" />
+  <input type='button' value='Void' onclick="void_order(<%= @order.id %>);" />
+<% end %>
+<% if @order.financial_status == 'captured' %>
+  <input type='button' value='Refund' onclick="refund_order(<%= @order.id %>);" />
+<% end %>
+<input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @order.id %>)" />
+<input type='button' value='Print Order' onclick="print_order(<%= @order.id %>);" />
+
+<% str = Caboose.plugin_hook('admin_edit_order_buttons', "", @order) %>
+<% if str %><%= raw str %><% end %>
+</p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<%= javascript_include_tag 'caboose/admin_edit_order' %>
+<script type='text/javascript'>
+
+var controller = new OrderController({ order_id: <%= raw Caboose.json(@order.id) %> });
+
+</script>
+<% end %>

data/app/views/caboose/orders/admin_new.html.erb

@@ -1,13 +1,6 @@
 <h1>New Manual Order</h1>
 
-<p><select name='product_id' id='product_id' onchange='populate_variants();'>
-<option value=''>-- Select a product --</option>
-<% @products.each do |p| %>
-  <option value='<%= p.id %>'><%= p.title %></option>
-<% end %>
-</select>
-<span id='variant_id_container'></span>
-</p>
+<p>This will create a new order that you can populate and then send to the customer for payment.</p>
 
 <p>
 <input type='button' value='< Back' onclick="window.location='/admin/orders';" />
@@ -17,23 +10,15 @@
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 
-var modal = false;
-$(window).load(function() { 
-  modal = new CabooseModal('95%');
-});
-
-function populate_variants()
+function create_order()
 {
-  $('#variant_id_container').empty().append("<p class='loading'>Getting variants...</p>");
-  var product_id = $('#product_id').val();
+  $('#message').empty().append("<p class='loading'>Creating order...</p>");  
   $.ajax({
-    url: '/admin/products/' + product_id + '/variants/json',    
-    success: function(variants) {
-      var select = $('<select/>').attr('id', 'variant_id');
-      $.each(variants, function(i, v) {
-        select.append($('<option/>').val(v.id).html(v.title));
-      });
-      $('#variant_id_container').empty().append(select);
+    url: '/admin/orders',
+    type: 'post',    
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;      
     }
   });
 }

data/app/views/caboose/products/admin_edit_images.html.erb

@@ -14,10 +14,12 @@ p = @product
 
 <div id='images'>
   <% if p.product_images.count > 0 %>
-    <% p.product_images.each do |img| %>
-      <% url = img.image.url(:tiny) %>
-      <div id='img_<%= img.id %>_container'><a href="javascript:select_image(<%= img.id %>);"><img src='<%= url %>' width='75' /></a></div> 
-    <% end %>
+    <ul id='images_list' class='clearfix'>
+      <% p.product_images.reorder(:position).each do |img| %>
+        <% url = img.image.url(:tiny) %>
+        <li id='img_<%= img.id %>'><div id='img_<%= img.id %>_container'><a href="javascript:select_image(<%= img.id %>);"><img src='<%= url %>' width='75' /></a></div></li> 
+      <% end %>
+    </ul>
   <% else %>
     <p>This product doesn't have any images yet.</p>
   <% end %>
@@ -34,6 +36,8 @@ p = @product
 #images div { display: inline-block; }
 #images div img { border: #000 4px solid; }
 #images div.selected img { border: #ff3333 4px solid; }
+#images_list { list-style: none; margin: 0; padding: 0; }
+#images_list li { list-style: none; margin: 0 10px 10px 0; padding: 0; float: left; }
 </style>
 <% end %>
 <% content_for :caboose_js do %>
@@ -43,6 +47,18 @@ $(document).ready(function() {
   <% if p.product_images.count > 0 %>
   select_image(<%= p.product_images[0].id %>);
   <% end %>
+  $('#images_list').sortable({
+    stop: function(e, ui) {
+      var arr = $('#images_list').sortable('toArray')
+      ids = $.map(arr, function(id, i) { return parseInt(id.replace('img_', '')); }); 
+      $.ajax({
+        url: '/admin/product-images/sort-order',
+        type: 'put',
+        data: { product_image_ids: ids },
+        success: function(resp) {}        
+      });
+    }
+  });
 });
 
 variants = false;

data/app/views/caboose/products/admin_index.html.erb

@@ -7,9 +7,15 @@
 </p>
 
 <form action="/admin/products" method="get" id="search_form" style="margin: 0 0 12px">
-	<input type="text" name="search_like" placeholder="Title or Vendor Name" value="<%= params[:search_like] %>" style="width: 350px" />
-	<input type="submit" value="Search" />
-	<input type="button" value="Clear" onclick="window.location='/admin/products'" />
+	<p><input type="text" name="search_like" placeholder="Title or Vendor Name" value="<%= params[:search_like] %>" style="width: 350px" /></p>
+	<p><select type="text" name="category_id" placeholder="Category" value="<%= params[:search_like] %>" style="width: 350px">
+	  <option value=''>-- Category --</option>
+	  <% @category_options.each do |cat| %><option value="<%= cat[:value] %>"<% if cat[:value] == params[:category_id] %> selected='true'<% end %>><%= cat[:text] %></option><% end %>
+	</select></p>
+	<p>
+	  <input type="submit" value="Search" />
+	  <input type="button" value="Clear" onclick="window.location='/admin/products'" />
+	</p>
 </form>
 	
 <div id='products'></div>

data/app/views/caboose/products/admin_sort.html.erb

@@ -11,8 +11,7 @@
     <input name="search" type="search" placeholder="Search for Products" />
     
     <select class="filter" name="vendor">
-      <option value="">-- Filter by Vendor --</option>
-      
+      <option value="">-- Filter by Vendor --</option>      
       <% @vendors.each do |vendor| %>
         <option value="<%= vendor.id %>"><%= vendor.name %></option>
       <% end %>
@@ -31,157 +30,154 @@
 </section>
 
 <% content_for :caboose_js do %>
-  <%= javascript_include_tag('underscore') %>
-  <%= javascript_include_tag('caboose/jquery-ui') %>
+<%= javascript_include_tag('underscore') %>
+<script type='text/javascript'>    
+window.products = <%= @products.to_json.html_safe %>;
+window.results  = window.products; // Used to store filtered results
+    
+// Delay method
+var delay = (function(){
+  var timer = 0;
+  return function(callback, ms){
+    clearTimeout (timer);
+    timer = setTimeout(callback, ms);
+  };
+})();
+    
+// Filter
+function filter(event) {
+  var $source       = $('ul#source')
+    , $search       = $('input[name=search]')
+    , search_string = $search.val() === $search.attr('placeholder') ? undefined : $search.val().trim().toUpperCase()
+    , vendor_id     = $('select[name=vendor]').val();
   
-  <script>
-    
-    window.products = <%= @products.to_json.html_safe %>;
-    window.results  = window.products; // Used to store filtered results
-    
-    // Delay method
-    var delay = (function(){
-      var timer = 0;
-      return function(callback, ms){
-        clearTimeout (timer);
-        timer = setTimeout(callback, ms);
-      };
-    })();
-    
-    // Filter
-    function filter(event) {
-      var $source       = $('ul#source')
-        , $search       = $('input[name=search]')
-        , search_string = $search.val() === $search.attr('placeholder') ? undefined : $search.val().trim().toUpperCase()
-        , vendor_id     = $('select[name=vendor]').val();
-      
-      $source.empty();
-      
-      _.each(window.products, function(product) {
-        if (!search_string && !vendor_id
-        || search_string && product.title.toUpperCase().indexOf(search_string) > -1
-        || vendor_id && product.vendor_id == vendor_id) {
-          $source.append( $('<li/>').attr('data-id', product.id).text(product.title) );
-        }
-      });
+  $source.empty();
+  
+  _.each(window.products, function(product) {
+    if (!search_string && !vendor_id
+    || search_string && product.title.toUpperCase().indexOf(search_string) > -1
+    || vendor_id && product.vendor_id == vendor_id) {
+      $source.append( $('<li/>').attr('data-id', product.id).text(product.title) );
     }
-    
-    function update(event) {
+  });
+}
+
+function update(event) {
+  
+  // Send the ordered array to the server to make it official
+  $.ajax({
+    type: 'put',
+    url: '/admin/products/update-sort-order',
+    data: { product_ids: $('ul#target').sortable('toArray', { attribute: 'data-id' }) }
+  });
+}
+
+$(document).ready(function() {
+  var selected_class = 'selected';
+  
+  // Selection rules
+  $('ul.sortable').on('click', 'li', function(event) {
+    $element = $(this);
+    
+    if (event.shiftKey && $last_element) {
+      if ($element.index() < $last_element.index()) {
+        $element.nextUntil($last_element).addClass(selected_class);
+      } else {
+        $element.prevUntil($last_element).addClass(selected_class);
+      }
       
-      // Send the ordered array to the server to make it official
-      $.ajax({
-        type: 'put',
-        url: '/admin/products/update-sort-order',
-        data: { product_ids: $('ul#target').sortable('toArray', { attribute: 'data-id' }) }
-      });
+      $element.toggleClass(selected_class);
+    } else if (event.ctrlKey || event.metaKey) {
+      if ($element.hasClass(selected_class)) {
+        $element.removeClass(selected_class);
+      } else {
+        $element.addClass(selected_class);
+      }
+    } else {
+      $element.addClass(selected_class).siblings().removeClass(selected_class);
     }
     
-    $(document).ready(function() {
-      var selected_class = 'selected';
+    $last_element = $element;
+  });
+  
+  // Setup sortable lists
+  $('ul#source').sortable({
+    delay: 150,
+    revert: 0,
+    connectWith: 'ul#target',
+    
+    helper: function(event, item) {
       
-      // Selection rules
-      $('ul.sortable').on('click', 'li', function(event) {
-        $element = $(this);
-        
-        if (event.shiftKey && $last_element) {
-          if ($element.index() < $last_element.index()) {
-            $element.nextUntil($last_element).addClass(selected_class);
-          } else {
-            $element.prevUntil($last_element).addClass(selected_class);
-          }
-          
-          $element.toggleClass(selected_class);
-        } else if (event.ctrlKey || event.metaKey) {
-          if ($element.hasClass(selected_class)) {
-            $element.removeClass(selected_class);
-          } else {
-            $element.addClass(selected_class);
-          }
-        } else {
-          $element.addClass(selected_class).siblings().removeClass(selected_class);
-        }
-        
-        $last_element = $element;
-      });
+      // If the user just clicked and immediately drug an element
+      if ( !item.hasClass(selected_class) ) item.addClass(selected_class).siblings().removeClass(selected_class);
       
-      // Setup sortable lists
-      $('ul#source').sortable({
-        delay: 150,
-        revert: 0,
-        connectWith: 'ul#target',
-        
-        helper: function(event, item) {
-          
-          // If the user just clicked and immediately drug an element
-          if ( !item.hasClass(selected_class) ) item.addClass(selected_class).siblings().removeClass(selected_class);
-          
-          // Grab the selected elements and create the helper
-          var elements = item.parent().children('.' + selected_class).clone()
-            , helper   = $('<li/>');
-            
-          // Add the elements to the item multidrag data attribute
-          item.data('multidrag', elements).siblings('.' + selected_class);
-          
-          // Pass back the helper
-          return helper.append(elements);
-        },
-        
-        start: function(event, ui) {
-          
-          // Make sure the item stays visible on #source
-          $(ui.item).show();
-          
-          // Clone the original item and note the previous one, to reappend after jquery ui takes it away
-          item_clone = $(ui.item).clone();
-          previous_item = $(ui.item).prev();
-          
-          // Remove selected status from ul#target
-          $('ul#target li.selected').removeClass('selected');
-        },
+      // Grab the selected elements and create the helper
+      var elements = item.parent().children('.' + selected_class).clone()
+        , helper   = $('<li/>');
         
-        beforeStop: function(event, ui) {
-          
-          if ($(ui.item).parent().attr('id') != 'source') {
-          
-            // Remove duplicate items from old positions
-            ui.item.data('multidrag').each(function(index, element) {
-              var $element = $(element);
-              $('ul#target li[data-id=' + $element.attr('data-id') + ']').not('.selected').remove()
-            });
-          }
-        },
-        
-        stop: function(event, ui) {
-          
-          if ($(ui.item).parent().attr('id') == 'source') return false;
-          
-          // Clear multidrag data
-          ui.item.after( ui.item.data('multidrag') ).remove();
-          
-          // If the previous item is defined append the clone just after, otherwise prepend to #source
-          if (previous_item.length) {
-            previous_item.after(item_clone);
-          } else {
-            $('ul#source').prepend(item_clone);
-          }
-          
-          // Update sort order
-          update(event, ui);
-        }
-      });
+      // Add the elements to the item multidrag data attribute
+      item.data('multidrag', elements).siblings('.' + selected_class);
+      
+      // Pass back the helper
+      return helper.append(elements);
+    },
+    
+    start: function(event, ui) {
+      
+      // Make sure the item stays visible on #source
+      $(ui.item).show();
+      
+      // Clone the original item and note the previous one, to reappend after jquery ui takes it away
+      item_clone = $(ui.item).clone();
+      previous_item = $(ui.item).prev();
+      
+      // Remove selected status from ul#target
+      $('ul#target li.selected').removeClass('selected');
+    },
+    
+    beforeStop: function(event, ui) {
       
-      // Update sort order when done sorting
-      $('ul#target').sortable({ stop: update });
+      if ($(ui.item).parent().attr('id') != 'source') {
       
-      // Filter when the vendor select box change
-      $('select').on('change', filter);
+        // Remove duplicate items from old positions
+        ui.item.data('multidrag').each(function(index, element) {
+          var $element = $(element);
+          $('ul#target li[data-id=' + $element.attr('data-id') + ']').not('.selected').remove()
+        });
+      }
+    },
+    
+    stop: function(event, ui) {
       
-      // Filter, after a delay, when there is a keyup event in the search
-      $('input[type=search]').on('keyup', function(event) {
-        delay(function() { filter(event) }, 600);
-      });
-    });
-  </script>
+      if ($(ui.item).parent().attr('id') == 'source') return false;
+      
+      // Clear multidrag data
+      ui.item.after( ui.item.data('multidrag') ).remove();
+      
+      // If the previous item is defined append the clone just after, otherwise prepend to #source
+      if (previous_item.length) {
+        previous_item.after(item_clone);
+      } else {
+        $('ul#source').prepend(item_clone);
+      }
+      
+      // Update sort order
+      update(event, ui);
+    }
+  });
+  
+  // Update sort order when done sorting
+  $('ul#target').sortable({ stop: update });
+  
+  // Filter when the vendor select box change
+  $('select').on('change', filter);
+  
+  // Filter, after a delay, when there is a keyup event in the search
+  $('input[type=search]').on('keyup', function(event) {
+    delay(function() { filter(event) }, 600);
+  });
+});
+</script>
 <% end %>
 
 <% content_for :caboose_css do %>