diff --git a/app/views/spree/admin/adjustments/_adjustments_table.html.erb b/app/views/spree/admin/adjustments/_adjustments_table.html.erb new file mode 100644 index 0000000000..3808bda9d8 --- /dev/null +++ b/app/views/spree/admin/adjustments/_adjustments_table.html.erb @@ -0,0 +1,36 @@ + + + + + + + + + + + + <% @collection.each do |adjustment| + @edit_url = edit_admin_order_adjustment_path(@order, adjustment) + @delete_url = admin_order_adjustment_path(@order, adjustment) + %> + + + + + + + + <% end %> + + + + + +
<%= "#{Spree.t('date')}/#{Spree.t('time')}" %><%= Spree.t(:description) %><%= Spree.t(:amount) %><%= Spree.t(:state) %>
<%= pretty_time(adjustment.created_at) %><%= adjustment.label %><%= adjustment.display_amount.to_html %><%= adjustment_state(adjustment) %> + <%= link_to_edit adjustment, :no_text => true %> + <%= link_to_delete adjustment, :no_text => true %> + <%= link_to_toggle_adjustment_state @order, adjustment, :no_text => true %> +
+ <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), :method => :get %>  + <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), :method => :get %> +  
diff --git a/app/views/spree/admin/adjustments/_form.html.erb b/app/views/spree/admin/adjustments/_form.html.erb new file mode 100644 index 0000000000..6d8dbefb8f --- /dev/null +++ b/app/views/spree/admin/adjustments/_form.html.erb @@ -0,0 +1,16 @@ +
+
+ <%= f.field_container :amount do %> + <%= f.label :amount, raw(Spree.t(:amount) + content_tag(:span, " *", :class => "required")) %> + <%= text_field :adjustment, :amount, :class => 'fullwidth' %> + <%= f.error_message_on :amount %> + <% end %> +
+
+ <%= f.field_container :label do %> + <%= f.label :label, raw(Spree.t(:description) + content_tag(:span, " *", :class => "required")) %> + <%= text_field :adjustment, :label, :class => 'fullwidth' %> + <%= f.error_message_on :label %> + <% end %> +
+
diff --git a/app/views/spree/admin/adjustments/edit.html.erb b/app/views/spree/admin/adjustments/edit.html.erb new file mode 100644 index 0000000000..83925aebd0 --- /dev/null +++ b/app/views/spree/admin/adjustments/edit.html.erb @@ -0,0 +1,22 @@ +<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %> + +<% content_for :page_title do %> + <%= Spree.t(:edit) %> <%= Spree.t(:adjustment) %> +<% end %> + +<% content_for :page_actions do %> +
  • <%= button_link_to Spree.t(:back_to_adjustments_list), spree.admin_order_adjustments_url(@order), :icon => 'icon-arrow-left' %>
    • +<% end %> + +<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %> +<%= form_for @adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :method => :put do |f| %> +
    + <%= render :partial => 'form', :locals => { :f => f } %> + +
    + <%= button Spree.t(:continue), 'icon-arrow-right' %> + <%= Spree.t(:or) %> + <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' %> +
    +
    +<% end %> diff --git a/app/views/spree/admin/adjustments/index.html.erb b/app/views/spree/admin/adjustments/index.html.erb new file mode 100644 index 0000000000..c2972414a8 --- /dev/null +++ b/app/views/spree/admin/adjustments/index.html.erb @@ -0,0 +1,14 @@ +<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %> + +<% content_for :page_title do %> + <%= Spree.t(:adjustments) %> +<% end %> + +<% content_for :page_actions do %> +
  • <%= button_link_to Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), :icon => 'icon-plus' %>
    • +
  • <%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %>
    • +<% end %> + +<%= render :partial => 'adjustments_table' %> + +<%= button_link_to Spree.t(:continue), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url, :icon => 'icon-arrow-right' %> diff --git a/app/views/spree/admin/adjustments/new.html.erb b/app/views/spree/admin/adjustments/new.html.erb new file mode 100644 index 0000000000..b75265f721 --- /dev/null +++ b/app/views/spree/admin/adjustments/new.html.erb @@ -0,0 +1,23 @@ +<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %> + +<% content_for :page_title do %> + <%= Spree.t(:new_adjustment) %> +<% end %> + +<% content_for :page_actions do %> +
  • <%= button_link_to Spree.t(:back_to_adjustments_list), spree.admin_order_adjustments_url(@order), :icon => 'icon-arrow-left' %>
    • +<% end %> + +<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %> + +<%= form_for @adjustment, :url => admin_order_adjustments_path do |f| %> +
    + <%= render :partial => 'form', :locals => { :f => f } %> + +
    + <%= button Spree.t(:continue), 'icon-arrow-right' %> + <%= Spree.t(:or) %> + <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'icon-remove' %> +
    +
    +<% end %>