spree_core 1.1.2.rc1 → 1.1.2

data/app/assets/javascripts/admin/admin.js.erb

@@ -123,7 +123,7 @@ $.fn.product_autocomplete = function(){
   return this.each(function() {
     $(this).autocomplete({
       source: function(request, response) {
-        $.get(Spree.routes.admin_products_path({format: 'json'}) + "?q=" + $('#add_product_name').val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        $.get(Spree.routes.product_search + '?' + jQuery.param({ q: $('#add_product_name').val(), authenticity_token: encodeURIComponent($('meta[name=csrf-token]').attr("content"))}), function(data) {
           result = prep_product_autocomplete_data(data)
           response(result);
         });
@@ -172,25 +172,12 @@ $.fn.objectPicker = function(url){
 };
 
 $.fn.productPicker = function(){
-  $(this).objectPicker(ajax_urls.product_search_basic_json);
+  $(this).objectPicker(Spree.routes.product_search_basic);
 }
 $.fn.userPicker = function(){
-  $(this).objectPicker(ajax_urls.user_search_basic_json);
+  $(this).objectPicker(Spree.routes.user_search);
 }
 
-// Possible defunct
-add_fields = function(target, association, content) {
-  var new_id = new Date().getTime();
-  var regexp = new RegExp("new_" + association, "g");
-  $(target).append(content.replace(regexp, new_id));
-}
-
-$('a.remove_fields').on('click', function() {
-  $(this).prev("input[type=hidden]").val("1");
-  $(this).closest(".fields").hide();
-  return false;
-});
-
 $(".observe_field").on('change', function() {
   target = $(this).attr("data-update");
   ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';

data/app/assets/javascripts/admin/checkouts/edit.js

@@ -46,7 +46,9 @@ $(document).ready(function(){
       minChars: 5,
       delay: 1500,
       source: function(request, response) {
-        $.get(Spree.routes.admin_users_path({format: 'json'}) + "?q=" + $("#customer_search").val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        var params = { q: $('#customer_search').val(),
+                       authenticity_token: encodeURIComponent($('meta[name=csrf-token]').attr("content")) }
+        $.get(Spree.routes.user_search + '&' + jQuery.param(params), function(data) {
           result = prep_user_autocomplete_data(data)
           response(result);
         });
@@ -78,6 +80,7 @@ $(document).ready(function(){
         $('#user_id').val(ui.item.data['id']);
         $('#guest_checkout_true').prop("checked", false);
         $('#guest_checkout_false').prop("checked", true);
+        $('#guest_checkout_false').prob("disabled", false);
         return true;
       }
     }).data("autocomplete")._renderItem = function(ul, item) {
@@ -107,7 +110,6 @@ $(document).ready(function(){
     $('#customer_search').val("");
     $('#user_id').val("");
     $('#checkout_email').val("");
-    $('#guest_checkout_false').prop("disabled", true);
 
     $('#order_bill_address_attributes_firstname').val("");
     $('#order_bill_address_attributes_lastname').val("");

data/app/assets/javascripts/admin/spree_core.js

@@ -7,6 +7,5 @@
 //= require jquery.jstree/jquery.jstree
 //= require jquery.alerts/jquery.alerts
 //= require_tree .
-function ajax_root_prefix(){
-  return $('body').data('ajax-root-path');
-}
+
+var Spree = {};

data/app/models/spree/order.rb

@@ -413,10 +413,6 @@ module Spree
       ShippingMethod.all_available(self, display_on)
     end
 
-    def available_payment_methods(display_on = nil)
-      PaymentMethod.all(display_on)
-    end
-
     def rate_hash
       @rate_hash ||= available_shipping_methods(:front_end).collect do |ship_method|
         next unless cost = ship_method.calculator.compute(self)

data/app/views/spree/admin/adjustments/_form.html.erb

@@ -1,12 +1,13 @@
-<%= f.field_container :amount do %>
-  <%= f.label :amount, t(:amount) %> <span class="required">*</span><br />
-  <%= text_field :adjustment, :amount, {:style => 'width:80px;'} %>
-  <%= f.error_message_on :amount %>
-<% end %>
-
-<%= f.field_container :label do %>
-  <%= f.label :label, t(:description) %> <span class="required">*</span><br />
-  <%= text_field :adjustment, :label, {:style => 'width:180px;'} %>
-  <%= f.error_message_on :label %>
-<% end %>
+<div data-hook="admin_adjustment_form_fields">
+  <%= f.field_container :amount do %>
+    <%= f.label :amount, t(:amount) %> <span class="required">*</span><br />
+    <%= text_field :adjustment, :amount, {:style => 'width:80px;'} %>
+    <%= f.error_message_on :amount %>
+  <% end %>
 
+  <%= f.field_container :label do %>
+    <%= f.label :label, t(:description) %> <span class="required">*</span><br />
+    <%= text_field :adjustment, :label, {:style => 'width:180px;'} %>
+    <%= f.error_message_on :label %>
+  <% end %>
+</div>

data/app/views/spree/admin/images/_form.html.erb

@@ -1,16 +1,18 @@
-<tr data-hook="file">
-  <td><%= t(:filename) %>:</td>
-  <td><%= f.file_field :attachment %></td>
-</tr>
-<% if @product.has_variants? %>
-  <tr data-hook="variant">
-    <td><%= Spree::Variant.model_name.human %>:</td>
-    <td><%= f.select :viewable_id, @variants %></td>
+<div data-hook="admin_image_form_fields">
+  <tr data-hook="file">
+    <td><%= t(:filename) %>:</td>
+    <td><%= f.file_field :attachment %></td>
   </tr>
-<% else %>
-  <%= hidden_field_tag :product_id, @product.id %>
-<% end %>
-<tr data-hook="alt_text">
-  <td><%= t(:alt_text) %>:</td>
-  <td><%= f.text_area :alt %></td>
-</tr>
+  <% if @product.has_variants? %>
+    <tr data-hook="variant">
+      <td><%= Spree::Variant.model_name.human %>:</td>
+      <td><%= f.select :viewable_id, @variants %></td>
+    </tr>
+  <% else %>
+    <%= hidden_field_tag :product_id, @product.id %>
+  <% end %>
+  <tr data-hook="alt_text">
+    <td><%= t(:alt_text) %>:</td>
+    <td><%= f.text_area :alt %></td>
+  </tr>
+</div>

data/app/views/spree/admin/mail_methods/_form.html.erb

@@ -1,90 +1,92 @@
-<div class="clearfix">
-  <div class="left" data-hook="general">
-    <fieldset>
-      <legend><%= t(:general) %></legend>
-      <p>
-        <%= f.label :environment, t(:environment) %><br />
-        <%= f.collection_select(:environment,
-                                Rails.configuration.database_configuration.keys.sort,
-                                :to_s, :titleize,
-                                {}, {:id => 'gtwy-env'}) %>
-      </p>
+<div data-hook="admin_mail_method_form_fields">
+  <div class="clearfix">
+    <div class="left" data-hook="general">
+      <fieldset>
+        <legend><%= t(:general) %></legend>
+        <p>
+          <%= f.label :environment, t(:environment) %><br />
+          <%= f.collection_select(:environment,
+                                  Rails.configuration.database_configuration.keys.sort,
+                                  :to_s, :titleize,
+                                  {}, {:id => 'gtwy-env'}) %>
+        </p>
 
-      <p>
-        <%= f.check_box :preferred_enable_mail_delivery, {:style => "vertical-align:middle;"} %>
-        <%= f.label :preferred_enable_mail_delivery, t(:enable_mail_delivery) %>
-      </p>
+        <p>
+          <%= f.check_box :preferred_enable_mail_delivery, {:style => "vertical-align:middle;"} %>
+          <%= f.label :preferred_enable_mail_delivery, t(:enable_mail_delivery) %>
+        </p>
 
-      <p>
-        <%= f.label :preferred_mails_from, t(:send_mails_as) %><br />
-        <%= f.text_field :preferred_mails_from, :size => 40, :maxlength => 256 %>
-        <br />
-        <span class="info">
-          <%= t(:smtp_send_all_emails_as_from_following_address) %>
-        </span>
-      </p>
+        <p>
+          <%= f.label :preferred_mails_from, t(:send_mails_as) %><br />
+          <%= f.text_field :preferred_mails_from, :size => 40, :maxlength => 256 %>
+          <br />
+          <span class="info">
+            <%= t(:smtp_send_all_emails_as_from_following_address) %>
+          </span>
+        </p>
 
-      <p>
-        <%= f.label :preferred_mail_bcc, t(:send_copy_of_all_mails_to) %><br />
-        <%= f.text_field :preferred_mail_bcc, :size => 40, :maxlength => 256 %>
-        <br />
-        <span class="info">
-          <%= t(:smtp_send_copy_to_this_addresses) %>
-        </span>
-      </p>
+        <p>
+          <%= f.label :preferred_mail_bcc, t(:send_copy_of_all_mails_to) %><br />
+          <%= f.text_field :preferred_mail_bcc, :size => 40, :maxlength => 256 %>
+          <br />
+          <span class="info">
+            <%= t(:smtp_send_copy_to_this_addresses) %>
+          </span>
+        </p>
 
-      <p>
-        <%= f.label :preferred_intercept_email, t(:intercept_email_address) %><br />
-        <%= f.text_field :preferred_intercept_email, :size => 40, :maxlength => 256 %>
-        <br />
-        <span class="info">
-          <%= t(:intercept_email_instructions) %>
-        </span>
-      </p>
+        <p>
+          <%= f.label :preferred_intercept_email, t(:intercept_email_address) %><br />
+          <%= f.text_field :preferred_intercept_email, :size => 40, :maxlength => 256 %>
+          <br />
+          <span class="info">
+            <%= t(:intercept_email_instructions) %>
+          </span>
+        </p>
 
-    </fieldset>
+      </fieldset>
 
-  </div>
+    </div>
 
-  <div class="right" data-hook="smtp">
+    <div class="right" data-hook="smtp">
 
-    <fieldset>
-      <legend><%= t(:smtp) %></legend>
-      <p>
-        <%= f.label :preferred_mail_domain, t(:smtp_domain) %><br />
-        <%= f.text_field :preferred_mail_domain %>
-      </p>
-      <p>
-        <%= f.label :preferred_mail_host, t(:smtp_mail_host) %><br />
-        <%= f.text_field :preferred_mail_host %>
-      </p>
-      <p>
-        <%= f.label :preferred_mail_port, t(:smtp_port) %><br />
-        <%= f.text_field :preferred_mail_port %>
-      </p>
-      <p>
-        <%= f.label :preferred_secure_connection_type, t(:secure_connection_type) %><br />
-        <%= f.collection_select(:preferred_secure_connection_type,
-                                Spree::MailMethod::SECURE_CONNECTION_TYPES,
-                                :to_s, :to_s,
-                                {}, {'style' => 'width:200px'}) %>
-      <p>
-        <%= f.label :preferred_mail_auth_type, t(:smtp_authentication_type) %><br />
-        <%= f.collection_select(:preferred_mail_auth_type,
-                                Spree::MailMethod::MAIL_AUTH,
-                                :to_s, :to_s,
-                                {}, {'style' => 'width:200px'}) %>
-      </p>
-      <p>
-        <%= f.label :preferred_smtp_username, t(:smtp_username) %><br />
-        <%= f.text_field :preferred_smtp_username %>
-      </p>
-      <p>
-        <%= f.label :preferred_smtp_password, t(:smtp_password) %><br />
-        <%= f.password_field :preferred_smtp_password %>
-      </p>
-    </fieldset>
+      <fieldset>
+        <legend><%= t(:smtp) %></legend>
+        <p>
+          <%= f.label :preferred_mail_domain, t(:smtp_domain) %><br />
+          <%= f.text_field :preferred_mail_domain %>
+        </p>
+        <p>
+          <%= f.label :preferred_mail_host, t(:smtp_mail_host) %><br />
+          <%= f.text_field :preferred_mail_host %>
+        </p>
+        <p>
+          <%= f.label :preferred_mail_port, t(:smtp_port) %><br />
+          <%= f.text_field :preferred_mail_port %>
+        </p>
+        <p>
+          <%= f.label :preferred_secure_connection_type, t(:secure_connection_type) %><br />
+          <%= f.collection_select(:preferred_secure_connection_type,
+                                  Spree::MailMethod::SECURE_CONNECTION_TYPES,
+                                  :to_s, :to_s,
+                                  {}, {'style' => 'width:200px'}) %>
+        <p>
+          <%= f.label :preferred_mail_auth_type, t(:smtp_authentication_type) %><br />
+          <%= f.collection_select(:preferred_mail_auth_type,
+                                  Spree::MailMethod::MAIL_AUTH,
+                                  :to_s, :to_s,
+                                  {}, {'style' => 'width:200px'}) %>
+        </p>
+        <p>
+          <%= f.label :preferred_smtp_username, t(:smtp_username) %><br />
+          <%= f.text_field :preferred_smtp_username %>
+        </p>
+        <p>
+          <%= f.label :preferred_smtp_password, t(:smtp_password) %><br />
+          <%= f.password_field :preferred_smtp_password %>
+        </p>
+      </fieldset>
 
-  </div>
+    </div>
 
+  </div>
 </div>

data/app/views/spree/admin/option_types/_form.html.erb

@@ -1,11 +1,13 @@
-<%= f.field_container :name do %>
-  <%= f.label :name, t(:name) %> <span class="required">*</span><br />
-  <%= f.text_field :name %>
-  <%= f.error_message_on :name %>
-<% end %>
+<div data-hook="admin_option_type_form_fields">
+  <%= f.field_container :name do %>
+    <%= f.label :name, t(:name) %> <span class="required">*</span><br />
+    <%= f.text_field :name %>
+    <%= f.error_message_on :name %>
+  <% end %>
 
-<%= f.field_container :presentation do %>
-  <%= f.label :presentation, t(:presentation) %> <span class="required">*</span><br />
-  <%= f.text_field :presentation %>
-  <%= f.error_message_on :presentation %>
-<% end %>
+  <%= f.field_container :presentation do %>
+    <%= f.label :presentation, t(:presentation) %> <span class="required">*</span><br />
+    <%= f.text_field :presentation %>
+    <%= f.error_message_on :presentation %>
+  <% end %>
+</div>

data/app/views/spree/admin/orders/_add_product.html.erb

@@ -12,8 +12,11 @@
     </div>
     <div style="float: left; width: 15%; padding-top: 17px;" data-hook="add_button">
       <%= link_to text_for_button_link(t(:add), :icon => 'add'),
-            admin_order_line_items_url(@order),
-            {:id => 'add_line_item_to_order', :class => 'button', 'data-update' => 'order-form-wrapper'} %>
+                  admin_order_line_items_url(@order),
+                  :method => :post,
+                  :id => 'add_line_item_to_order',
+                  :class => 'button',
+                  'data-update' => 'order-form-wrapper' %>
     </div>
 
   </fieldset>

data/app/views/spree/admin/orders/_form.html.erb

@@ -1,54 +1,56 @@
-<% if @line_item.try(:errors).present? %>
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
-<% end %>
+ <div data-hook="admin_order_form_fields">
+  <% if @line_item.try(:errors).present? %>
+    <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
+  <% end %>
 
-<%= form_for @order, :url => admin_order_url(@order), :method => :put do |f| %>
-  <%= f.hidden_field :number %>
-  <table class="index">
-    <tbody id="line-items">
-      <tr data-hook="admin_order_form_line_items_headers">
-        <th><%= t(:item_description) %></th>
-        <th class="price"><%= t(:price) %></th>
-        <th class="qty"><%= t(:qty) %></th>
-        <th class="total"><span><%= t(:total) %></span></th>
-        <th class="orders-actions" data-hook="admin_order_form_line_items_header_actions"></th>
-      </tr>
-      <%= f.fields_for :line_items do |li_form| %>
-        <%= render :partial => 'spree/admin/orders/line_item', :locals => { :f => li_form } %>
-      <% end %>
-    </tbody>
-    <tbody id="subtotal" data-hook="admin_order_form_subtotal">
-      <tr id="subtotal-row">
-        <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
-        <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
-        <td></td>
-      </tr>
-    </tbody>
-    <tbody id="order-charges" data-hook="admin_order_form_adjustments">
-      <% @order.adjustments.each do |adjustment| %>
+  <%= form_for @order, :url => admin_order_url(@order), :method => :put do |f| %>
+    <%= f.hidden_field :number %>
+    <table class="index">
+      <tbody id="line-items">
+        <tr data-hook="admin_order_form_line_items_headers">
+          <th><%= t(:item_description) %></th>
+          <th class="price"><%= t(:price) %></th>
+          <th class="qty"><%= t(:qty) %></th>
+          <th class="total"><span><%= t(:total) %></span></th>
+          <th class="orders-actions" data-hook="admin_order_form_line_items_header_actions"></th>
+        </tr>
+        <%= f.fields_for :line_items do |li_form| %>
+          <%= render :partial => 'spree/admin/orders/line_item', :locals => { :f => li_form } %>
+        <% end %>
+      </tbody>
+      <tbody id="subtotal" data-hook="admin_order_form_subtotal">
+        <tr id="subtotal-row">
+          <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
+          <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
+          <td></td>
+        </tr>
+      </tbody>
+      <tbody id="order-charges" data-hook="admin_order_form_adjustments">
+        <% @order.adjustments.each do |adjustment| %>
+          <tr>
+            <td colspan="3"><strong><%= adjustment.label %></strong></td>
+            <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
+            <td></td>
+          </tr>
+        <% end %>
+      </tbody>
+      <tbody id="order-total" data-hook="admin_order_form_total">
         <tr>
-          <td colspan="3"><strong><%= adjustment.label %></strong></td>
-          <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
+          <td colspan="3"><b><%= t(:order_total) %>:</b></td>
+          <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
           <td></td>
         </tr>
-      <% end %>
-    </tbody>
-    <tbody id="order-total" data-hook="admin_order_form_total">
-      <tr>
-        <td colspan="3"><b><%= t(:order_total) %>:</b></td>
-        <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
+      </tbody>
+    </table>
 
-  <p class="form-buttons" data-hook="admin_order_form_buttons">
-    <%= button t(:update) %>
-    <%= t(:or) %> <%= link_to t(:back), admin_orders_url %>
-  </p>
+    <p class="form-buttons" data-hook="admin_order_form_buttons">
+      <%= button t(:update) %>
+      <%= t(:or) %> <%= link_to t(:back), admin_orders_url %>
+    </p>
 
-<% end %>
+  <% end %>
 
-<%= javascript_tag do -%>
-  <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>
-<% end -%>
+  <%= javascript_tag do -%>
+    <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>
+  <% end -%>
+</div>