goca-spree-backend 3.1.14.rails.5.0

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

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

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

@@ -0,0 +1,46 @@
+<% if order.line_items.exists? %>
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:order_line_items) %>
+      </h1>
+    </div>
+    <table class="table table-bordered line-items" data-hook="line-items">
+      <thead>
+        <th colspan="2"><%= Spree.t(:name) %></th>
+        <th class="text-center"><%= Spree.t(:price) %></th>
+        <th class="text-center"><%= Spree.t(:quantity) %></th>
+        <th class="text-center"><%= Spree.t(:total_price) %></th>
+        <th class="orders-actions text-center" data-hook="admin_order_form_line_items_header_actions"></th>
+      </thead>
+      <tbody>
+        <% order.line_items.each do |item| %>
+          <tr class="line-item" id="line-item-<%= item.id %>">
+            <td class="line-item-image image text-center">
+              <%= mini_image(item.variant) %>
+            </td>
+            <td class="line-item-name text-center">
+              <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+            </td>
+            <td class="line-item-price text-center"><%= item.single_money.to_html %></td>
+            <td class="line-item-qty-show text-center">
+              <%= item.quantity %>
+            </td>
+            <td class="line-item-qty-edit is-hidden">
+              <%= number_field_tag :quantity, item.quantity, min: 0, class: "line_item_quantity form-control", size: 5 %>
+            </td>
+            <td class="line-item-total text-center"><%= line_item_shipment_price(item, item.quantity) %></td>
+            <td class="cart-line-item-delete actions actions-4 text-center" data-hook="cart_line_item_delete">
+              <% if can? :update, item %>
+                <%= link_to_with_icon 'arrow-left', Spree.t('actions.cancel'), "#", class: 'cancel-line-item btn btn-default btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
+                <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-line-item btn btn-success btn-sm', no_text: true, data: { :'line-item-id' => item.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none' %>
+                <%= link_to_with_icon 'edit', Spree.t('edit'), "#", class: 'edit-line-item btn btn-primary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
+                <%= link_to_with_icon 'delete', Spree.t('delete'), "#", class: 'delete-line-item btn btn-danger btn-sm', data: { 'line-item-id' => item.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% end %>

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

@@ -0,0 +1,39 @@
+<div data-hook="admin_order_form_fields">
+  <% if @line_item.try(:errors).present? %>
+      <%= render 'spree/admin/shared/error_messages', target: @line_item %>
+  <% end %>
+
+  <%= render "spree/admin/orders/line_items", order: order %>
+  <%= render "spree/admin/orders/adjustments",
+          adjustments: @order.line_item_adjustments,
+          order: order,
+          title: Spree.t(:line_item_adjustments)
+  %>
+  <%= render "spree/admin/orders/adjustments",
+          adjustments: @order.shipment_adjustments,
+          order: order,
+          title: Spree.t(:shipment_adjustments)
+  %>
+  <%= render "spree/admin/orders/adjustments",
+          adjustments: @order.adjustments,
+          order: order,
+          title: Spree.t(:order_adjustments)
+  %>
+
+  <% if order.line_items.exists? %>
+    <div class="alert alert-success" id="order-total" data-hook="order_details_total">
+      <%= Spree.t(:order_total) %>: <strong class="order-total"><%= order.display_total %></strong>
+    </div>
+  <% end %>
+
+  <%= javascript_tag do %>
+    var order_number = '<%= @order.number %>';
+    var shipments = [];
+
+    <% @order.shipments.each do |shipment| %>
+      shipments.push(<%== shipment.as_json(root: false, only: [:id, :tracking, :number, :state, :stock_location_id], include: [:inventory_units, :stock_location]).to_json %>);
+    <% end %>
+
+    <%= render partial: 'spree/admin/shared/update_order_state', handlers: [:js] %>
+  <% end %>
+</div>

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

@@ -0,0 +1,12 @@
+<% content_for :page_actions do %>
+  <% if can?(:fire, order) %>
+    <%= event_links(order, events) %>
+  <% end %>
+  <% if can?(:resend, order) %>
+    <%= button_link_to Spree.t(:resend, scope: 'admin.order.events', default: Spree.t(:resend)),
+          resend_admin_order_url(order),
+          method: :post,
+          icon: 'envelope'
+    %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,47 @@
+<fieldset id="risk_analysis">
+  <legend><%= "#{Spree.t(:risk_analysis)}: #{Spree.t(:not) unless @order.is_risky?} #{Spree.t(:risky)}" %></legend>
+  <table class="table table-condensed table-bordered">
+    <thead>
+      <th><%= Spree.t('risk')%></th>
+      <th><%= Spree.t('status')%></th>
+    </thead>
+    <tbody id="risk-analysis" data-hook="order_details_adjustments"  class="with-border">
+      <tr class="">
+        <td>
+          <strong><%= Spree.t(:failed_payment_attempts) %>:</strong>
+        </td>
+        <td>
+          <span class="label label-<%= @order.payments.failed.size > 0 ? 'void' : 'complete' %>">
+            <%= link_to "#{Spree.t 'payments_count', count: @order.payments.failed.size, default: pluralize(@order.payments.failed.size, Spree.t(:payment))}", spree.admin_order_payments_path(@order) %>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td><strong><%= Spree.t(:avs_response) %>:</strong></td>
+        <td>
+          <span class="label label-<%= latest_payment.is_avs_risky? ? 'void' : 'complete' %>">
+            <% if latest_payment.is_avs_risky? %>
+              <%= "#{Spree.t(:error)}: #{avs_response_code[latest_payment.avs_response]}" %>
+            <% else %>
+              <%= Spree.t(:success) %>
+            <% end %>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td><strong><%= Spree.t(:cvv_response) %>:</strong></td>
+        <td>
+          <span class="label label-<%= latest_payment.is_cvv_risky? ? 'void' : 'complete' %>">
+            <% if latest_payment.is_cvv_risky? %>
+              <%= "#{Spree.t(:error)}: #{cvv_response_code[latest_payment.cvv_response_code]}" %>
+            <% else %>
+              <%= Spree.t(:success) %>
+            <% end %>
+          </span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</fieldset>

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

@@ -0,0 +1,108 @@
+<div id="<%= "shipment_#{shipment.id}" %>" data-hook="admin_shipment_form" class="panel panel-default">
+
+  <%= render partial: "spree/admin/variants/split", formats: :js %>
+
+  <div class="panel-heading stock-location no-borderb" data-hook="stock-location">
+    <h1 class="panel-title">
+      <span class="shipment-number"><%= shipment.number %></span>
+      -
+      <span class="shipment-state"><%= Spree.t("shipment_states.#{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 Spree.t(:ship), 'javascript:;', class: 'ship pull-right btn btn-success', data: { 'shipment-number' => shipment.number } %>
+        <div class='clearfix'></div>
+      <% end %>
+    </h1>
+  </div>
+
+  <table class="table table-bordered stock-contents" data-hook="stock-contents">
+    <thead>
+      <th colspan="2"><%= Spree.t(:item_description) %></th>
+      <th width="15%" class="text-center"><%= Spree.t(:price) %></th>
+      <th width="15%" class="text-center"><%= Spree.t(:quantity) %></th>
+      <th width="15%" class="text-center"><%= Spree.t(:total) %></th>
+      <th class="orders-actions actions text-center" data-hook="admin_order_form_line_items_header_actions"></th>
+    </thead>
+
+    <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
+      <%= render 'spree/admin/orders/shipment_manifest', shipment: shipment %>
+
+      <% unless shipment.shipped? %>
+        <tr class="edit-method is-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', data: {'shipment-number' => shipment.number } } %>
+            </div>
+          </td>
+          <td class="actions text-center">
+            <% if can? :update, shipment %>
+              <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+              <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+            <% end %>
+          </td>
+        </tr>
+        <% end %>
+
+        <tr class="show-method total">
+          <% if rate = shipment.selected_shipping_rate %>
+            <td colspan="4">
+              <strong><%= rate.name %></strong>
+            </td>
+            <td class="total text-center">
+              <%= shipment.display_cost %>
+            </td>
+          <% else %>
+            <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
+          <% end %>
+
+          <td class="actions text-center">
+            <% if( (can? :update, shipment) and !shipment.shipped?) %>
+              <%= link_to_with_icon 'edit', Spree.t('edit'), "javascript:;", class: 'edit-method with-tip btn btn-sm btn-primary', data: {action: 'edit'}, no_text: true %>
+            <% end %>
+          </td>
+        </tr>
+
+
+      <tr class="edit-tracking is-hidden total">
+        <td colspan="5">
+          <label><%= Spree.t(:tracking_number) %>:</label>
+          <%= text_field_tag :tracking, shipment.tracking, class: "form-control" %>
+        </td>
+        <td class="actions">
+          <% if can? :update, shipment %>
+            <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", :class => 'cancel-tracking btn btn-primary btn-sm', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :no_text => true %>
+            <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", :class => 'save-tracking btn btn-success btn-sm', :data => {'shipment-number' => shipment.number, :action => 'save'}, :title => Spree.t('actions.save'), :no_text => true %>
+          <% end %>
+        </td>
+      </tr>
+
+      <% if order.special_instructions.present? %>
+        <tr class='special_instructions'>
+          <td colspan="5">
+            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= order.special_instructions %>
+          </td>
+        </tr>
+      <% end %>
+
+      <tr class="show-tracking total">
+        <td colspan="5" class="tracking-value">
+          <% if shipment.tracking.present? %>
+            <strong><%= Spree.t(:tracking) %>:</strong> <%= link_to_tracking(shipment, target: '_blank') %>
+          <% else %>
+            <%= Spree.t(:no_tracking_present) %>
+          <% end %>
+        </td>
+        <td class="actions text-center">
+          <% if can? :update, shipment %>
+            <%= link_to_with_icon 'edit', Spree.t('edit'), "#", class: 'edit-tracking btn btn-primary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
+          <% end %>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+</div>

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

@@ -0,0 +1,42 @@
+<% shipment.manifest.each do |item| %>
+  <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
+    <td class="item-image image text-center">
+      <%= mini_image(item.variant) %>
+    </td>
+
+    <td class="item-name">
+      <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+      <% if item.variant.sku.present? %>
+        <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
+      <% end %>
+    </td>
+
+    <td class="item-price text-center"><%= item.line_item.single_money.to_html %></td>
+
+    <td class="item-qty-show text-center">
+      <% item.states.each do |state,count| %>
+        <%= count %> x <%= Spree.t(state).downcase %>
+      <% end %>
+    </td>
+
+    <% unless shipment.shipped? %>
+      <td class="item-qty-edit is-hidden">
+        <%= number_field_tag :quantity, item.quantity, min: 0, class: "line_item_quantity form-control", size: 5 %>
+      </td>
+    <% end %>
+
+    <td class="item-total text-center">
+      <%= line_item_shipment_price(item.line_item, item.quantity) %>
+    </td>
+
+    <td class="cart-item-delete actions actions-3 text-center" data-hook="cart_item_delete">
+      <% if((!shipment.shipped?) && can?(:update, item.line_item)) %>
+        <%= link_to_with_icon 'pencil', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-default btn-sm', title: Spree.t('actions.edit'), no_text: true %>
+        <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-item  btn btn-primary btn-sm', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
+        <%= link_to_with_icon 'ok', Spree.t('actions.save'), "#", class: 'save-item btn btn-success btn-sm', data: {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none', no_text: true %>
+        <%= link_to_with_icon 'split', Spree.t('split'), "#", class: 'split-item btn btn-primary btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>
+        <%= link_to_with_icon 'delete', Spree.t('delete'), "#", class: 'delete-item btn btn-danger btn-sm', data: { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
+      <% end %>
+    </td>
+  </tr>
+<% end %>

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

@@ -0,0 +1,31 @@
+<%= render 'order_actions', order: @order, events: @order_events %>
+
+<%= render 'spree/admin/shared/order_tabs', current: :cart %>
+
+<div data-hook="admin_order_edit_header">
+  <%= render 'spree/admin/shared/error_messages', target: @order %>
+</div>
+
+<% if @order.payments.exists? && @order.considered_risky? %>
+  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
+<% end %>
+
+<%= render 'add_line_item' if can?(:update, @order) %>
+
+<% if @order.line_items.empty? %>
+  <div class="alert alert-warning">
+    <%= Spree.t(:your_order_is_empty_add_product)%>
+  </div>
+<% end %>
+
+<div data-hook="admin_order_edit_form">
+  <div id="order-form-wrapper">
+    <%= render 'line_items_edit_form', order: @order %>
+  </div>
+</div>
+
+<% content_for :head do %>
+  <%= javascript_tag 'var expand_variants = true;' %>
+<% end %>
+
+<%= render 'spree/admin/shared/order_summary' %>

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

@@ -0,0 +1,106 @@
+<div data-hook="admin_customer_detail_form_fields">
+
+  <div class="panel panel-default" data-hook="customer_guest">
+
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:account) %>
+      </h1>
+    </div>
+
+    <div class="panel-body">
+      <div data-hook="customer_fields" class="row">
+        <div class="col-md-8">
+          <div class="form-group">
+            <%= f.label :email, Spree.t(:email) %>
+            <% if can? :edit, @order.user %>
+              <%= f.email_field :email, class: 'form-control' %>
+            <% else %>
+              <p><%= @order.user.try(:email) || @order.email %></p>
+            <% end %>
+          </div>
+        </div>
+        <div class="col-md-4">
+          <div class="form-group">
+            <strong><%= label_tag nil, Spree.t(:guest_checkout) %></strong>
+            <% guest = @order.user.nil? %>
+
+            <% if @order.completed? %>
+              <div>
+                <span class="badge">
+                  <%= guest ? Spree.t(:say_yes) : Spree.t(:say_no) %>
+                  <%= hidden_field_tag :guest_checkout, guest %>
+                </span>
+              </div>
+            <% else %>
+              <div class="radio no-margint">
+                <%= label_tag :guest_checkout_true do %>
+                  <%= radio_button_tag :guest_checkout, true, guest %>
+                  <%= Spree.t(:say_yes) %>
+                <% end %>
+              </div>
+              <div class="radio">
+                <%= label_tag :guest_checkout_false do %>
+                  <%= radio_button_tag :guest_checkout, false, !guest, disabled: @order.cart? %>
+                  <%= Spree.t(:say_no) %>
+                <% end %>
+              </div>
+              <%= hidden_field_tag :user_id, @order.user_id %>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+
+  <div class="row">
+    <div data-hook="bill_address_wrapper" class="col-md-6">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h1 class="panel-title"><%= Spree.t(:billing_address) %></h1>
+        </div>
+
+        <div class="panel-body">
+          <% if can? :edit, @order.user %>
+            <%= f.fields_for :bill_address do |ba_form| %>
+              <%= render 'spree/admin/shared/address_form', f: ba_form, type: "billing" %>
+            <% end %>
+          <% else %>
+            <%= render 'spree/admin/shared/address', address: @order.bill_address %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+
+    <div class="col-md-6" data-hook="ship_address_wrapper">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h1 class="panel-title"><%= Spree.t(:shipping_address) %></h1>
+        </div>
+        <div class="panel-body">
+          <% if can? :edit, @order.user %>
+            <%= f.fields_for :ship_address do |sa_form| %>
+              <div class="form-group">
+                <span data-hook="use_billing">
+                  <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
+                  <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+                </span>
+              </div>
+
+              <%= render 'spree/admin/shared/address_form', f: sa_form, type: 'shipping' %>
+            <% end %>
+          <% else %>
+            <%= render 'spree/admin/shared/address', address: @order.ship_address %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <% if can? :edit, @order.user %>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t('actions.update'), 'save' %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,29 @@
+<%= render 'spree/admin/shared/order_tabs', current: :customer_details %>
+
+<% content_for :page_title do %>
+  / <%= Spree.t(:customer_details) %>
+<% end %>
+
+<% if can? :edit, @order.user %>
+  <div id="select-customer" class="panel panel-default" data-hook>
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:customer_search) %>
+      </h1>
+    </div>
+    <div class="panel-body">
+      <%= hidden_field_tag :customer_search,  nil, class: 'error-message' %>
+      <%= render partial: "spree/admin/orders/customer_details/autocomplete", formats: :js %>
+    </div>
+  </div>
+<% end %>
+
+<%= render 'spree/admin/shared/error_messages', target: @order %>
+
+<%= form_for @order, url: spree.admin_order_customer_url(@order) do |f| %>
+  <%= render 'form', f: f %>
+<% end %>
+
+<br>
+
+<%= render 'spree/admin/shared/order_summary' %>

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

@@ -0,0 +1,35 @@
+<%= render 'order_actions', order: @order, events: @order_events %>
+
+<%= render 'spree/admin/shared/order_tabs', current: :shipments %>
+
+<% content_for :page_title do %>
+  / <%= plural_resource_name(Spree::Shipment) %>
+<% end %>
+
+<div data-hook="admin_order_edit_header">
+  <%= render 'spree/admin/shared/error_messages', target: @order %>
+</div>
+
+<% if @order.payments.valid.any? && @order.considered_risky? %>
+  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.valid.last %>
+<% end %>
+
+<%= render 'add_product' if @order.shipment_state != 'shipped' && can?(:update, @order) %>
+
+<% if @order.line_items.empty? %>
+  <div class="alert alert-warning">
+    <%= 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 %>
+
+<%= render 'spree/admin/shared/order_summary' %>