spree_core 0.70.7 → 1.0.0.rc1

data/app/views/admin/option_types/index.html.erb

@@ -1,33 +0,0 @@
-<%= render :partial => 'admin/shared/product_sub_menu' %>
-
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
-    <li id="new_ot_link">
-      <%= button_link_to t(:new_option_type), new_admin_option_type_url, {:remote => true, :icon => 'add', :id => 'new_option_type_link'} %>
-    </li>
-  </ul>
-  <br class="clear" />
-</div>
-
-<h1><%= t(:option_types) %></h1>
-
-<div id="new_option_type"></div>
-
-<table class="index sortable" id="listing_option_types" data-hook>
-  <tr data-hook="option_header">
-    <th><%= t(:name) %></th>
-    <th><%= t(:presentation) %></th>
-    <th></th>
-  </tr>
-  <% @option_types.each do |option_type| %>
-    <tr id="<%= dom_id option_type %>" data-hook="option_row">
-      <td><span class="handle"></span> <%= option_type.name %></td>
-      <td class="presentation"><%= option_type.presentation %></td>
-      <td class="actions">
-        <%= link_to_edit(option_type, :class => 'admin_edit_option_type') %>
-        &nbsp;
-        <%= link_to_delete(option_type) %>
-      </td>
-    </tr>
-  <% end %>
-</table>

data/app/views/admin/option_types/new.html.erb

@@ -1,11 +0,0 @@
-<%= render :partial => 'admin/shared/product_sub_menu' %>
-
-<%= render 'shared/error_messages', :target => @option_type %>
-
-<%= form_for [:admin, @option_type] do |f| %>
-  <fieldset>
-    <legend><%= t(:new_option_type) %></legend>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'admin/shared/new_resource_links' %>
-  </fieldset>
-<% end %>

data/app/views/admin/option_types/new.js.erb

@@ -1,2 +0,0 @@
-$("#new_option_type").html('<%= escape_javascript(render :template => "admin/option_types/new.html.erb") %>');
-$("#new_option_type_link").parent().hide();

data/app/views/admin/option_types/selected.html.erb

@@ -1,6 +0,0 @@
-<%= render :partial => 'admin/shared/product_sub_menu' %>
-<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => 'Option Types'} %>
-
-<div id="selected-options" data-hook>
-  <%= render 'selected' %>
-</div>

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

@@ -1,20 +0,0 @@
-<div id="add-line-item" data-hook>
-  <fieldset>
-    <legend><%= t(:add_product) %></legend>
-    <div style="float:left; width:65%; margin-right:5%;" data-hook="add_product_name">
-      <%= label_tag :add_product_name, t(:name_or_sku) %>
-      <%= text_field_tag :add_product_name, nil, :class => 'fullwidth title'  %>
-      <%= hidden_field_tag :add_variant_id %>
-    </div>
-    <div style="float:left; width:10%; margin-right:5%;" data-hook="add_quantity">
-      <%= label_tag :add_quantity, t(:qty) %>
-      <%= text_field_tag :add_quantity,  1 , :class => 'fullwidth title'  %>
-    </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'} %>
-    </div>
-
-  </fieldset>
-</div>

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

@@ -1,56 +0,0 @@
-<% if @line_item.try(:errors).present? %>
-  <%= render 'shared/error_messages', :target => @line_item %>
-<% end %>
-
-<%= form_for @order, :url => admin_order_url(@order), :html => { :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 => '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"><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>
-
-  <p class="form-buttons" data-hook="admin_order_form_buttons">
-    <%= button @order.complete? ? t(:update) : t(:continue) %>
-    <%= t(:or) %> <%= link_to t('actions.cancel'), admin_orders_url %>
-  </p>
-
-<% end %>
-
-<%= javascript_tag do -%>
-  <%= render 'admin/shared/update_order_state.js' %>
-<% end -%>
-
-<%= javascript_include_tag 'admin/orders/edit_form' %>

data/app/views/admin/orders/_line_item.html.erb

@@ -1,14 +0,0 @@
-<tr id="<%= dom_id(f.object) %>" data-hook="admin_order_form_line_item_row">
-  <td width="300">
-    <%=f.object.variant.product.name%> <%= "(#{f.object.variant.options_text}))" unless f.object.variant.option_values.empty? %>
-  </td>
-  <td valign="top" class="price"><%= number_to_currency f.object.price %></td>
-  <td valign="top" class="qty"><%= f.text_field :quantity, :style => "width:30px;", :class => "qty" %></td>
-  <td valign="top" class="total"><%= number_to_currency (f.object.price * f.object.quantity) %></td>
-  <td data-hook="admin_order_form_line_item_actions">
-    <%= link_to_delete f.object, {:url => admin_order_line_item_url(@order.number, f.object),
-                                  :dataType => 'html',
-                                  :success => "function(r){ $('#order-form-wrapper').html(r);}"},
-                                  :title => "admin_delete_#{dom_id(@order)}" %>
-  </td>
-</tr>

data/app/views/admin/orders/_user_form.html.erb

@@ -1,47 +0,0 @@
-
-<h3><%= t(:customer_details) %></h3>
-<table class="index" data-hook="customer_guest">
-  <thead>
-    <th colspan="8"><%= t(:account) %></th>
-  </thead>
-  <tbody>
-    <tr data-hook="customer_fields">
-      <td class="lbl-col"><%= f.label :email, t(:email) + ':' %></td>
-      <td class="val-col" colspan="3"><%= f.text_field :email, :class => 'fullwidth' %></td>
-      <td class="lbl-col"><%= label_tag nil, t(:guest_checkout) %>:</td>
-      <td class="val-col" colspan="3">
-        <% if @order.completed? %>
-          <%= @order.user.nil? ? t(:yes) : t(:no) %>
-        <% else %>
-          <% guest = @order.user.nil? || @order.user.anonymous? %>
-          <label class="sub">
-            <%= radio_button_tag :guest_checkout, true, guest %>
-            <%= t(:yes) %>
-          </label> &nbsp;
-          <label class="sub">
-            <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
-            <%= t(:no) %>
-          </label>
-          <%= text_field_tag :user_id, @order.user_id %>
-        <% end %>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<h3><%= Address.model_name.human(:count => 2) %></h3>
-<%= f.fields_for :bill_address do |ba_form|  %>
-  <%= render :partial => 'admin/shared/address_form', :locals => {:f => ba_form, :name => t(:billing_address), :use_billing => false} %>
-<% end %>
-
-<%= f.fields_for :ship_address do |sa_form|  %>
-  <%= render :partial => 'admin/shared/address_form', :locals => {:f => sa_form, :name => t(:shipping_address), :use_billing => true} %>
-<% end %>
-
-<p class="form-buttons" data-hook="buttons">
-  <%= button @order.cart? ? t(:continue) : t(:update) %>
-</p>
-
-<% content_for :head do %>
-  <%= javascript_include_tag '/states.js', 'admin/address_states.js' %>
-<% end %>

data/app/views/admin/orders/edit.html.erb

@@ -1,27 +0,0 @@
-<%= csrf_meta_tags %>
-<div class="order-links" data-hook="admin_order_edit_buttons">
-  <div class="toolbar">
-    <%= event_links %>
-  </div>
-  <div class="toolbar">
-    <%= button_link_to t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'send-email' if @order.user %>
-  </div>
-</div>
-
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Order Details'} %>
-
-<div data-hook="admin_order_edit_header">
-  <%= render 'shared/error_messages', :target => @order %>
-</div>
-
-<%= render :partial => 'add_product' %>
-
-<div data-hook="admin_order_edit_form">
-  <div id="order-form-wrapper">
-    <%= render :partial => 'form', :locals => {:order => @order} %>
-  </div>
-</div>
-
-<% content_for :head do %>
-  <%= javascript_tag 'var expand_variants = true;' %>
-<% end %>

data/app/views/admin/orders/history.html.erb

@@ -1,29 +0,0 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'History'} %>
-
-<h2><%= t(:history) %></h2>
-
-<table class="index">
-  <tr data-hook="history_header">
-    <th><%= t(:event) %></th>
-    <th><%= t(:from_state) %></th>
-    <th><%= t(:to_state) %></th>
-    <th><%= t(:user) %></th>
-    <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-  </tr>
-  <% @order.state_events.sort.each do |event| %>
-    <tr data-hook="history_row">
-      <td><%=t("#{event.name}") if event.name.present? %></td>
-      <td><%=t("#{event.name}_state#{'s' unless event.name == 'order'}.#{event.previous_state}") %></td>
-      <td><%=t("#{event.name}_state#{'s' unless event.name == 'order'}.#{event.next_state}") %></td>
-      <td><%=event.user.email if event.user %></td>
-      <td><%=event.created_at.to_s(:date_time24) %></td>
-    </tr>
-  <% end %>
-  <% if @order.state_events.empty? %>
-    <tr data-hook="history_none">
-      <td colspan="5"><%= t(:none_available) %></td>
-    </tr>
-  <% end %>
-</table>
-
-<%= button_link_to t(:continue), admin_orders_url %>

data/app/views/admin/orders/index.html.erb

@@ -1,90 +0,0 @@
-<div class='toolbar order-links'>
-  <%= button_link_to t(:new_order), new_admin_order_url, :icon => 'add', :id => 'admin_new_order' %>
-</div>
-
-<%= render :partial => 'admin/shared/order_sub_menu' %>
-
-<h1><%= t(:listing_orders) %></h1>
-
-<table class="index" id="listing_orders" data-hook>
-  <thead>
-    <tr data-hook="admin_orders_index_headers">
-      <% if @show_only_completed %>
-        <th><%= sort_link @search, :completed_at, t('activerecord.attributes.order.completed_at') %></th>
-      <% else %>
-        <th><%= sort_link @search, :created_at,   t(:order_date) %></th>
-      <% end %>
-      <th><%= sort_link @search, :number,         t(:order_number) %></th>
-      <th><%= sort_link @search, :state,          t(:status) %></th>
-      <th><%= sort_link @search, :payment_state,  t(:payment_state) %></th>
-      <th><%= sort_link @search, :shipment_state, t(:shipment_state) %></th>
-      <th><%= sort_link @search, :email,          t(:customer) %></th>
-      <th><%= sort_link @search, :total,          t(:total) %></th>
-      <th data-hook="admin_orders_index_header_actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-  <% @orders.each do |order| %>
-    <tr data-hook="admin_orders_index_rows">
-      <td><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
-      <td><%= link_to order.number, admin_order_path(order) %></td>
-      <td><%= t("order_state.#{order.state.downcase}") %></td>
-      <td><%= link_to t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></td>
-      <td><%= link_to t("shipment_states.#{order.shipment_state}"), admin_order_shipments_path(order) if order.shipment_state %></td>
-      <td><%= order.email %></td>
-      <td><%= number_to_currency order.total %></td>
-      <td class='actions' data-hook="admin_orders_index_row_actions">
-        <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}" %>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
-<%= paginate @orders %>
-
-
-<% content_for :sidebar do %>
-  <div class="box" data-hook="admin_orders_index_search">
-    <h3><%= t(:search) %></h3>
-    <%= form_for [:admin, @search] do |f| %>
-      <%= label_tag nil, t(:date_range) %><br />
-      <div class="date-range-filter">
-        <div class="left sub-field">
-          <%= f.text_field :created_at_greater_than, :class => 'datepicker' %><br />
-          <%= label_tag nil, t(:start), :class => 'sub' %>
-        </div>
-        <div class="right sub-field">
-          <%= f.text_field :created_at_less_than, :class => 'datepicker' %><br />
-          <%= label_tag nil, t(:stop), :class => 'sub' %>
-        </div>
-      </div>
-
-      <p><%= label_tag nil, t(:status) %><br />
-      <%= f.select :state_equals, Order.state_machines[:state].states.collect {|s| [t("order_state.#{s.name}"), s.value]}, {:include_blank => true} %></p>
-
-      <p>
-        <%= label_tag nil, t(:order_number) %><br />
-        <%= f.text_field :number_like, :size => 25 %>
-      </p>
-      <p>
-        <%= label_tag nil, t(:email) %><br />
-        <%= f.text_field :email_like, :size => 25 %>
-      </p>
-      <p>
-        <%= label_tag nil, t(:first_name_begins_with) %><br />
-        <%= f.text_field :bill_address_firstname_starts_with, :size => 25 %>
-      </p>
-      <p>
-        <%= label_tag nil, t(:last_name_begins_with) %><br />
-        <%= f.text_field :bill_address_lastname_starts_with, :size => 25 %>
-      </p>
-      <p>
-        <%= f.check_box :completed_at_is_not_null, {:checked => @show_only_completed}, '1', '' %>
-        <%= label_tag nil, t(:show_only_complete_orders) %>
-      </p>
-      <div data-hook="admin_orders_index_search_buttons">
-        <p><%= button t(:search) %></p>
-      </div>
-    <% end %>
-  </div>
-<% end %>

data/app/views/admin/orders/new.html.erb

@@ -1,19 +0,0 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Order Details'} %>
-<%= csrf_meta_tags %>
-
-<div data-hook="admin_order_new_header">
-  <h2><%= t(:new_order)%></h2>
-  <%= render 'shared/error_messages', :target => @order %>
-</div>
-
-<%= render :partial => 'add_product' %>
-
-<div data-hook="admin_order_new_form">
-  <div id="order-form-wrapper">
-    <%= render :partial => 'form' %>
-  </div>
-</div>
-
-<% content_for :head do %>
-  <%= javascript_tag 'var expand_variants = true;' %>
-<% end %>

data/app/views/admin/orders/show.html.erb

@@ -1,26 +0,0 @@
-<div class="toolbar order-links" data-hook="admin_order_show_buttons">
-  <%= button_link_to t(:cancel), fire_admin_order_url(@order.number, {:e => "cancel"}), :icon => 'delete', :confirm => t(:are_you_sure) if @order.can_cancel? %>
-  <%= button_link_to t(:edit), edit_admin_order_url(@order.number), :icon => 'edit' %>
-</div>
-
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Order Details'} %>
-
-<div data-hook="admin_order_show_addresses">
-  <% if @order.bill_address %>
-    <div class="adr">
-      <h4><%= t(:bill_address) %></h4>
-      <%= render :partial => 'admin/shared/address', :locals => {:address => @order.bill_address} %>
-    </div>
-  <% end %>
-  <% if @order.ship_address %>
-    <div class='adr'>
-      <h4><%= t(:ship_address) %></h4>
-      <%= render :partial => 'admin/shared/address', :locals => {:address => @order.ship_address} %>
-    </div>
-    <% end %>
-  <hr />
-</div>
-
-<div data-hook="admin_order_show_details">
-  <%= render :partial => 'admin/shared/order_details', :locals => {:order => @order} %>
-</div>

data/app/views/admin/orders/user.html.erb

@@ -1,19 +0,0 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Customer Details'} %>
-<%= csrf_meta_tags %>
-
-<% if @order.cart? %>
-  <div id="add-line-item" data-hook>
-    <fieldset>
-      <legend><%= t(:customer_search) %></legend>
-      <%= label_tag :customer_search, t(:enter_at_least_five_letters) %>
-      <%= text_field_tag :customer_search,  nil, :class => 'fullwidth title'  %>
-    </fieldset>
-  </div>
-<% end %>
-
-<%= render 'shared/error_messages', :target => @order %>
-
-<%= form_for @order, :url => admin_order_url(@order), :html => { :method => :put} do |f| %>
-  <%= f.hidden_field :number %>
-  <%= render :partial => 'user_form', :locals => {:f => f} %>
-<% end %>

data/app/views/admin/payment_methods/_form.html.erb

@@ -1,50 +0,0 @@
-<table data-hook="payment_method">
-  <tr data-hook="name">
-    <td><%= label_tag nil, t(:name) %></td>
-    <td><%= text_field :payment_method, :name, {'style' => 'width:200px;'} %></td>
-  </tr>
-  <tr data-hook="description">
-    <td><%= label_tag nil, t(:description) %></td>
-    <td><%= text_area :payment_method, :description, {:cols => 60, :rows => 4} %></td>
-  </tr>
-  <tr data-hook="environment">
-    <td><%= label_tag nil, t(:environment) %></td>
-    <td>
-      <%= collection_select(:payment_method, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
-    </td>
-  </tr>
-  <tr data-hook="display">
-    <td><%= label_tag nil, t(:display) %></td>
-    <td>
-      <%= select(:payment_method, :display_on, PaymentMethod::DISPLAY.collect {|display| [t(display), display == :both ? nil : display.to_s]}) %>
-    </td>
-  </tr>
-  <tr data-hook="active">
-    <td><%= label_tag nil, t(:active) %></td>
-    <td>
-      <label class="sub">
-        <%= radio_button :payment_method, :active, true %>
-        <%= t(:yes) %>
-      </label> &nbsp;
-      <label class="sub">
-        <%= radio_button :payment_method, :active, false %>
-        <%= t(:no) %>
-      </label>
-    </td>
-  </tr>
-</table>
-
-<h2><%= t(:settings) %></h2>
-
-<div id="preference-settings" data-hook>
-  <%= f.label :type, t(:provider) %>
-  <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type'}) %>
-
-  <% unless @object.new_record? %>
-    <%= preference_fields(@object, f) %>
-
-    <% if @object.respond_to?(:preferences) %>
-      <div id="gateway-settings-warning" style="color:#FF0000;"><%= t(:provider_settings_warning) %></div>
-    <% end %>
-  <% end %>
-</div>