spree_backend 2.0.0.rc1

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

@@ -0,0 +1,9 @@
+<tr id="<%= spree_dom_id(f.object) %>" data-hook="admin_order_form_line_item_row" class="<%= cycle('odd', 'even')%>">
+  <td><%=f.object.variant.product.name%> <%= "(#{f.object.variant.options_text})" unless f.object.variant.option_values.empty? %></td>
+  <td class="price align-center"><%= f.object.single_money %></td>
+  <td class="qty"><%= f.number_field :quantity, :min => 0, :class => "qty" %></td>
+  <td class="total align-center"><%= f.object.display_amount %></td>
+  <td data-hook="admin_order_form_line_item_actions" class="actions">
+    <%= link_to_delete f.object, {:url => admin_order_line_item_url(@order.number, f.object), :no_text => true} %>
+  </td>
+</tr>

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

@@ -0,0 +1,148 @@
+<fieldset class="no-border-bottom">
+  <legend align="center" class="stock-location" data-hook="stock-location">
+    <span class="shipment-number"><%= shipment.number %></span>
+    -
+    <span class="shipment-state"><%= shipment.state %></span>
+    <%= Spree.t(:package_from) %>
+    <strong class="stock-location-name" data-hook="stock-location-name">'<%= shipment.stock_location.name %>'</strong>
+    <% if shipment.ready? and can? :update, shipment %>
+      -
+      <%= link_to 'ship', '#', :class => 'ship button icon-arrow-right', :data => {'shipment-number' => shipment.number} %>
+    <% end %>
+  </legend>
+</fieldset>
+
+<table class="stock-contents index" data-hook="stock-contents">
+  <colgroup>
+    <col style="width: 10%;" />
+    <col style="width: 30%;" />
+    <col style="width: 15%;" />
+    <col style="width: 15%;" />
+    <col style="width: 15%;" />
+    <col style="width: 15%;" />
+  </colgroup>
+
+  <thead>
+    <th colspan="2"><%= Spree.t(:item_description) %></th>
+    <th><%= Spree.t(:price) %></th>
+    <th><%= Spree.t(:quantity) %></th>
+    <th><%= Spree.t(:total) %></th>
+    <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions"></th>
+  </thead>
+
+  <tbody>
+    <% shipment.manifest.each do |item| %>
+      <% line_item = order.find_line_item_by_variant(item.variant) %>
+
+      <tr class="stock-item">
+        <td class="item-image"><%= mini_image(item.variant) %></td>
+        <td class="item-name">
+          <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+        </td>
+        <td class="item-price align-center"><%= line_item.single_money.to_html %></td>
+        <td class="item-qty-show align-center">
+            <% item.states.each do |state,count| %>
+              <%= count %> x <%= state.humanize.downcase %>
+            <% end %>
+        </td>
+        <% unless shipment.shipped? %>
+          <td class="item-qty-edit hidden">
+            <%= number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
+          </td>
+        <% end %>
+        <td class="item-total align-center"><%= line_item.display_amount.to_html %></td>
+        <% unless shipment.shipped? %>
+          <td class="cart-item-delete actions" data-hook="cart_item_delete">
+            <% if can? :update, item %>
+              <%= link_to '', '#', :class => 'save-item icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
+              <%= link_to '', '#', :class => 'cancel-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
+              <%= link_to '', '#', :class => 'edit-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
+              <%= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t(:delete) %>
+            <% end %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+
+    <% unless shipment.shipped? %>
+      <tr class="edit-method hidden total">
+        <td colspan="5">
+          <div class="field alpha five columns">
+            <%= label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) %>
+            <%= select_tag :selected_shipping_rate_id,
+                  options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
+                  {:class => 'select2 fullwidth', :data => {'shipment-number' => shipment.number } } %>
+          </div>
+
+          <% if shipment.adjustment && shipment.adjustment.closed? %>
+            <div class="field omega four columns">
+              <label><%= Spree.t(:associated_adjustment_closed) %></label>
+              <ul>
+                <li><%= radio_button_tag :open_adjustment, 'yes', false, :data => {'shipment-number' => shipment.number } %> Yes</li>
+                <li><%= radio_button_tag :open_adjustment, 'no', true, :data => {'shipment-number' => shipment.number } %> No</li>
+              </ul>
+            </div>
+          <% end %>
+        </td>
+        <td class="actions">
+          <% if can? :update, shipment %>
+            <%= link_to '', '#', :class => 'save-method icon_link icon-ok no-text with-tip',
+              :data => {'shipment-number' => shipment.number, :action => 'save'}, title: Spree.t('actions.save') %>
+            <%= link_to '', '#', :class => 'cancel-method icon_link icon-cancel no-text with-tip',
+              :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+
+    <tr class="show-method total">
+      <td colspan="4">
+        <% if shipment.adjustment.present? %>
+          <strong><%= shipment.adjustment.label %>:</strong>
+        <% else %>
+          <%= Spree.t(:cannot_set_shipping_method_without_address) %>
+        <% end %>
+      </td>
+      <td class="total" align="center">
+        <% if shipment.adjustment.present? %>
+          <span><%= shipment.adjustment.display_amount %></span>
+        <% end %>
+      </td>
+      <% if shipment.adjustment.present? && !shipment.shipped? %>
+        <td class="actions">
+          <% if can? :update, shipment %>
+            <%= link_to '', '#', :class => 'edit-method icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
+          <% end %>
+        </td>
+      <% end %>
+    </tr>
+
+    <tr class="edit-tracking hidden total">
+      <td colspan="5">
+        <label><%= Spree.t(:tracking_number) %>:</label>
+        <%= text_field_tag :tracking, shipment.tracking %>
+      </td>
+      <td class="actions">
+        <% if can? :update, shipment %>
+          <%= link_to '', '#', :class => 'save-tracking icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, :action => 'save'}, :title => Spree.t('actions.save') %>
+          <%= link_to '', '#', :class => 'cancel-tracking icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
+        <% end %>
+      </td>
+    </tr>
+
+    <tr class="show-tracking total">
+      <td colspan="5">
+        <% if shipment.tracking.present? %>
+          <strong><%= Spree.t(:tracking) %>:</strong> <%= shipment.tracking %>
+        <% else %>
+          <%= Spree.t(:no_tracking_present) %>
+        <% end %>
+      </td>
+      <td class="actions">
+        <% if can? :update, shipment %>
+          <%= link_to '', '#', :class => 'edit-tracking icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
+        <% end %>
+      </td>
+    </tr>
+  </tbody>
+</table>

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

@@ -0,0 +1,66 @@
+<fieldset data-hook="admin_customer_detail_form_fields" class="no-border-top">
+  
+  <fieldset class="index no-border-bottom" data-hook="customer_guest">
+    <legend align="center"><%= Spree.t(:account) %></legend>
+      
+    <div data-hook="customer_fields" class="row">
+      <div class="alpha eight columns">
+        <div class="field">
+          <%= f.label :email, Spree.t(:email) + ':' %>
+          <%= f.email_field :email, :class => 'fullwidth' %>
+        </div>
+      </div>
+      <div class="omega four columns">
+        <div class="field">
+          <%= label_tag nil, Spree.t(:guest_checkout) %>:
+          <ul>
+            <% if @order.completed? %>
+              <li>
+                <%= @order.user.nil? ? Spree.t(:say_yes) : Spree.t(:say_no) %>
+              </li>
+            <% else %>
+              <% guest = @order.user.nil? || @order.user.anonymous? %>
+              <li>
+                <%= radio_button_tag :guest_checkout, true, guest %>
+                <%= Spree.t(:say_yes) %>
+              </li>
+              <li>
+                <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
+                <%= Spree.t(:say_no) %>  
+              </li>              
+              <%= hidden_field_tag :user_id, @order.user_id %>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </fieldset>
+
+  <div data-hook="bill_address_wrapper" class="alpha six columns">
+    <fieldset class="no-border-bottom">
+      <legend align="center"><%= Spree.t(:billing_address) %></legend>
+      <%= f.fields_for :bill_address do |ba_form| %>
+        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :name => Spree.t(:billing_address), :use_billing => false } %>
+      <% end %>
+    </fieldset>
+  </div>
+  
+  <div class="omega six columns" data-hook="ship_address_wrapper">
+    <fieldset class="no-border-bottom">
+      <legend align="center"><%= Spree.t(:shipping_address) %></legend>
+      <%= f.fields_for :ship_address do |sa_form| %>
+        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :name => Spree.t(:shipping_address), :use_billing => true } %>
+      <% end %>    
+    </fieldset>
+  </div>
+
+  <div class="clear"></div>
+
+  <div class="form-buttons filter-actions actions" data-hook="buttons">
+    <%= button Spree.t('actions.update'), 'icon-refresh' %>
+  </div>
+
+  <% content_for :head do %>
+    <%= javascript_include_tag 'admin/address_states.js' %>
+  <% end %>
+</fieldset>

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

@@ -0,0 +1,27 @@
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Details' } %>
+
+<%= csrf_meta_tags %>
+
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i> <%= Spree.t(:customer_details) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
+<% end %>
+
+<% if @order.cart? %>
+  <div id="select-customer" data-hook>
+    <fieldset class="no-border-bottom">
+      <legend align="center"><%= Spree.t(:customer_search) %></legend>
+      <%= hidden_field_tag :customer_search,  nil, :class => 'fullwidth title' %>
+      <%= render :partial => "spree/admin/orders/customer_details/autocomplete", :formats => :js %>
+    </fieldset>
+  </div>
+<% end %>
+
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+
+<%= form_for @order, :url => admin_order_customer_url(@order) do |f| %>
+  <%= render 'form', :f => f %>
+<% end %>

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

@@ -0,0 +1,30 @@
+<%= csrf_meta_tags %>
+<% content_for :page_actions do %>
+  <li><%= event_links %></li>
+  <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'icon-email' %></li>
+  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Order Details' } %>
+
+<div data-hook="admin_order_edit_header">
+  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+</div>
+
+<%= render :partial => 'add_product' %>
+
+<% if @order.line_items.empty? %>
+  <div class="no-objects-found">
+    <%= Spree.t(:your_order_is_empty_add_product)%>
+  </div>
+<% end %>
+
+<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/spree/admin/orders/index.html.erb

@@ -0,0 +1,134 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:listing_orders) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:new_order), new_admin_order_url, :icon => 'icon-plus', :id => 'admin_new_order' %>
+  </li>
+<% end %>
+
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_orders_index_search">
+    <%= search_form_for [:admin, @search] do |f| %>
+      <div class="field-block alpha four columns">
+        <div class="date-range-filter field">
+          <%= label_tag nil, Spree.t(:date_range) %>
+          <div class="date-range-fields">
+            <%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => params[:q][:created_at_gt], :placeholder => Spree.t(:start) %>
+
+            <span class="range-divider">
+              <i class="icon-arrow-right"></i>
+            </span>
+
+            <%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => params[:q][:created_at_lt], :placeholder => Spree.t(:stop) %>
+          </div>
+        </div>
+
+        <div class="field">
+          <%= label_tag nil, Spree.t(:status) %>
+          <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>
+        </div>
+      </div>
+
+      <div class="four columns">
+        <div class="field">
+          <%= label_tag nil, Spree.t(:order_number) %>
+          <%= f.text_field :number_cont %>
+        </div>
+        <div class="field">
+          <%= label_tag nil, Spree.t(:email) %>
+          <%= f.email_field :email_cont %>
+        </div>
+      </div>
+
+      <div class="four columns">
+        <div class="field">
+          <%= label_tag nil, Spree.t(:first_name_begins_with) %>
+          <%= f.text_field :bill_address_firstname_start, :size => 25 %>
+        </div>
+        <div class="field">
+          <%= label_tag nil, Spree.t(:last_name_begins_with) %>
+          <%= f.text_field :bill_address_lastname_start, :size => 25%>
+        </div>
+      </div>
+
+      <div class="omega four columns">
+        <div class="field checkbox">
+          <label>
+            <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '' %>
+            <%= Spree.t(:show_only_complete_orders) %>
+          </label>
+        </div>
+
+      </div>
+
+      <div class="clearfix"></div>
+
+      <div class="actions filter-actions">
+        <div data-hook="admin_orders_index_search_buttons">
+          <%= button Spree.t(:filter_results), 'icon-search' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<%= paginate @orders %>
+
+<% unless @orders.empty? %>
+  <table class="index responsive" id="listing_orders" data-hook>
+    <colgroup>
+       <col style="width: 13%;">
+       <col style="width: 10%;">
+       <col style="width: 10%;">
+       <col style="width: 12%;">
+       <col style="width: 12%;">
+       <col style="width: 25%;">
+       <col style="width: 10%;">
+       <col style="width: 8%;">
+    </colgroup>
+    <thead>
+      <tr data-hook="admin_orders_index_headers">
+        <% if @show_only_completed %>
+          <th><%= sort_link @search, :completed_at, I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order') %></th>
+        <% else %>
+          <th><%= sort_link @search, :created_at,   I18n.t(:created_at, :scope => 'activerecord.attributes.spree/order') %></th>
+        <% end %>
+        <th><%= sort_link @search, :number,         I18n.t(:number, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :state,          I18n.t(:state, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :payment_state,  I18n.t(:payment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :email,          I18n.t(:email, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :total,          I18n.t(:total, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th data-hook="admin_orders_index_header_actions" class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% @orders.each do |order| %>
+      <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
+        <td class="align-center"><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
+        <td class="align-center"><%= link_to order.number, edit_admin_order_path(order) %></td>
+        <td class="align-center"><span class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span></td>
+        <td class="align-center"><span class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></span></td>
+        <td class="align-center"><span class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") if order.shipment_state %></span></td>
+        <td><%= mail_to order.email %></td>
+        <td class="align-center"><%= order.display_total.to_html %></td>
+        <td class='actions align-center' data-hook="admin_orders_index_row_actions">
+          <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}", :no_text => true %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="no-objects-found">
+    <%= Spree.t(:no_orders_found)%>
+  </div>
+<% end %>
+
+<%= paginate @orders %>

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

@@ -0,0 +1,57 @@
+<% # Usage of old-style form helpers in this file is INTENTIONAL
+   # For reasons, see commit 3e981c7. %>
+<div data-hook="admin_payment_method_form_fields">
+
+  <div data-hook="payment_method">
+
+    <div class="alpha four columns">
+      <div id="preference-settings" data-hook class="field">
+        <%= f.label :type, Spree.t(:provider) %>
+        <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2 fullwidth'}) %>
+
+        <% unless @object.new_record? %>
+          <%= preference_fields(@object, f) %>
+
+          <% if @object.respond_to?(:preferences) %>
+            <div id="gateway-settings-warning" class="info warning"><%= Spree.t(:provider_settings_warning) %></div>
+          <% end %>
+        <% end %>
+      </div>      
+      <div data-hook="environment" class="field">
+        <%= label_tag nil, Spree.t(:environment) %>
+        <%= collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env', :class => 'select2 fullwidth'}) %>        
+      </div>
+      <div data-hook="display" class="field">
+        <%= label_tag nil, Spree.t(:display) %>
+        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
+      </div>
+      <div data-hook="active" class="field">
+        <%= label_tag nil, Spree.t(:active) %>
+        <ul>
+          <li>
+            <%= radio_button :payment_method, :active, true %>
+            <%= label_tag nil, Spree.t(:say_yes) %>
+          </li>        
+          <li>
+            <%= radio_button :payment_method, :active, false %>
+            <%= label_tag nil, Spree.t(:say_no) %>
+          </li>
+        </ul>
+      </div>
+    </div>
+    
+    <div class="omega eight columns">
+      <div data-hook="name" class="field">
+        <%= label_tag nil, Spree.t(:name) %>
+        <%= text_field :payment_method, :name, :class => 'fullwidth' %>
+      </div>
+      <div data-hook="description" class="field">
+        <%= label_tag nil, Spree.t(:description) %>
+        <%= text_area :payment_method, :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} %>
+      </div>  
+    </div>
+    
+  </div>
+</div>
+
+<div class="clear"></div>