solidus_backend 2.0.3 → 2.1.0.beta1

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

@@ -19,8 +19,8 @@
       <col style="width: 10%">
       <col style="width: 13%">
       <col style="width: 33%">
-      <col style="width: 13%">
-      <col style="width: 19%">
+      <col style="width: 16%">
+      <col style="width: 16%">
       <col style="width: 19%">
       <col style="width: 13%">
     </colgroup>
@@ -29,7 +29,8 @@
         <th class="no-border"></th>
         <th><%= Spree::PaymentMethod.human_attribute_name(:name) %></th>
         <th><%= Spree::PaymentMethod.human_attribute_name(:type) %></th>
-        <th><%= Spree::PaymentMethod.human_attribute_name(:display_on) %></th>
+        <th><%= Spree::PaymentMethod.human_attribute_name(:available_to_users) %></th>
+        <th><%= Spree::PaymentMethod.human_attribute_name(:available_to_admin) %></th>
         <th><%= Spree::PaymentMethod.human_attribute_name(:active) %></th>
         <th data-hook="admin_payment_methods_index_header_actions" class="actions"></th>
       </tr>
@@ -40,7 +41,8 @@
           <td class="no-border"><span class="handle"></span></td>
           <td class="align-center"><%= method.name %></td>
           <td class="align-center"><%= method.type %></td>
-          <td class="align-center"><%= method.display_on.blank? ? Spree.t(:both) : Spree.t(method.display_on) %></td>
+          <td class="align-center"><%= method.available_to_users ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="align-center"><%= method.available_to_admin ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="align-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions">
             <% if can?(:update, method.becomes(Spree::PaymentMethod)) %>
@@ -55,7 +57,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::PaymentMethod,
                  new_resource_url: new_object_url %>

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

@@ -1,11 +1,11 @@
 <div data-hook="admin_payment_form_fields" class="row">
-  <div class="alpha three columns">
+  <div class="col-xs-3">
     <div class="field">
       <%= f.label :amount %>
       <%= f.text_field :amount, :value => @order.display_outstanding_balance.money, :class => 'fullwidth' %>
     </div>
   </div>
-  <div class="omega nine columns">
+  <div class="col-xs-9">
     <div class="field">
       <label><%= Spree::PaymentMethod.model_name.human %></label>
       <ul>

data/app/views/spree/admin/payments/index.html.erb

@@ -29,5 +29,5 @@
   <% end %>
 
 <% else %>
-  <div class="alpha twelve columns no-objects-found"><%= Spree.t(:order_has_no_payments) %></div>
+  <div class="col-xs-9 no-objects-found"><%= Spree.t(:order_has_no_payments) %></div>
 <% end %>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -13,41 +13,43 @@
 
     <div class="clear"></div>
 
-    <div class="alpha four columns">
-      <div data-hook="card_number">
-        <div class="field">
-          <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
-          <%= label_tag "card_number#{payment_method.id}", Spree::CreditCard.human_attribute_name(:number), class: 'required' %>
-          <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required fullwidth cardNumber', :id => "card_number#{payment_method.id}", :maxlength => 19 %>
-          <span id="card_type" style="display:none;">
-            ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
-              <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
-            )
-          </span>
+    <div class="row">
+      <div class="col-xs-5">
+        <div data-hook="card_number">
+          <div class="field">
+            <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
+            <%= label_tag "card_number#{payment_method.id}", Spree::CreditCard.human_attribute_name(:number), class: 'required' %>
+            <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required fullwidth cardNumber', :id => "card_number#{payment_method.id}", :maxlength => 19 %>
+            <span id="card_type" style="display:none;">
+              ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
+                <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
+              )
+            </span>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="alpha four columns">
-      <div data-hook="card_name">
-        <div class="field">
-          <%= label_tag "card_name#{payment_method.id}", Spree::CreditCard.human_attribute_name(:name), class: 'required' %>
-          <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required fullwidth', maxlength: 19 %>
+      <div class="col-xs-5">
+        <div data-hook="card_name">
+          <div class="field">
+            <%= label_tag "card_name#{payment_method.id}", Spree::CreditCard.human_attribute_name(:name), class: 'required' %>
+            <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required fullwidth', maxlength: 19 %>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="three columns">
-      <div data-hook="card_expiration" class="field">
-        <%= label_tag "card_expiry#{payment_method.id}", Spree::CreditCard.human_attribute_name(:expiration), class: 'required' %>
-        <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry", placeholder: "MM / YY" %>
+      <div class="col-xs-4">
+        <div data-hook="card_expiration" class="field">
+          <%= label_tag "card_expiry#{payment_method.id}", Spree::CreditCard.human_attribute_name(:expiration), class: 'required' %>
+          <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry", placeholder: "MM / YY" %>
+        </div>
       </div>
-    </div>
-    <div class="omega two columns">
-      <div data-hook="card_code" class="field">
-        <%= label_tag "card_code#{payment_method.id}", Spree::CreditCard.human_attribute_name(:card_code), class: 'required' %>
-        <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required fullwidth cardCode', size: 5 %>
-        <a href="/content/cvv" class="info cvvLink" target="_blank">
-          (<%= Spree.t(:what_is_this) %>)
-        </a>
+      <div class="col-xs-3">
+        <div data-hook="card_code" class="field">
+          <%= label_tag "card_code#{payment_method.id}", Spree::CreditCard.human_attribute_name(:card_code), class: 'required' %>
+          <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required fullwidth cardCode', size: 5 %>
+          <a href="/content/cvv" class="info cvvLink" target="_blank">
+            (<%= Spree.t(:what_is_this) %>)
+          </a>
+        </div>
       </div>
     </div>
 

data/app/views/spree/admin/payments/source_forms/_storecredit.html.erb

@@ -0,0 +1 @@
+<%= t('.not_supported') %>

data/app/views/spree/admin/payments/source_views/_gateway.html.erb

@@ -2,7 +2,7 @@
   <legend align="center"><%= Spree::CreditCard.model_name.human %></legend>
 
   <div class="row">
-    <div class="alpha six columns">
+    <div class="col-xs-4">
       <dl>
         <dt><%= Spree.t(:name_on_card) %>:</dt>
         <dd><%= payment.source.name %></dd>

data/app/views/spree/admin/payments/source_views/_storecredit.html.erb

@@ -2,7 +2,7 @@
   <legend align="center"><%= Spree::StoreCredit.model_name.human %></legend>
 
   <div class="row">
-    <div class="alpha six columns">
+    <div class="col-xs-4">
       <dl>
         <dt><%= Spree::StoreCreditCategory.model_name.human %>:</dt>
         <dd><%= payment.source.category.name%></dd>
@@ -16,6 +16,13 @@
         <dt><%= Spree::StoreCredit.human_attribute_name(:issued_on) %>:</dt>
         <dd><%= l payment.source.created_at.to_date %></dd>
       </dl>
+
+      <p>
+        <%= link_to(
+          Spree.t("admin.store_credits.view"),
+          admin_user_store_credit_path(payment.source.user, payment.source)
+        ) %>
+      </p>
     </div>
   </div>
 </fieldset>

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

@@ -1,53 +1,48 @@
 <div data-hook="admin_product_price_fields">
 
   <div data-hook="admin_product_price_form">
-    <div class="four columns alpha" data-hook="admin_product_price_form_variant">
-      <%= f.field_container :variant do %>
-        <%= f.label :variant %>
-        <%= f.select :variant_id,
-                     @product.variants_including_master.map { |v| [v.descriptive_name, v.id] },
-                     {},
-                     class: "select2 fullwidth", disabled: !f.object.new_record? %>
-      <% end %>
-    </div>
+    <div class="row">
+      <div class="col-xs-3" data-hook="admin_product_price_form_variant">
+        <%= f.field_container :variant do %>
+          <%= f.label :variant %>
+          <%= f.select :variant_id,
+                      @product.variants_including_master.map { |v| [v.descriptive_name, v.id] },
+                      {},
+                      class: "select2 fullwidth", disabled: !f.object.new_record? %>
+        <% end %>
+      </div>
 
-    <div class="three columns alpha" data-hook="admin_product_price_form_currency">
-      <%= f.field_container :currency do %>
-        <%= f.label :currency %>
-        <%= f.select :currency,
-                     Money::Currency.all.map { |c| ["#{c.iso_code} (#{c.name})", c.iso_code] },
-                     {},
-                     class: "select2 fullwidth", disabled: !f.object.new_record? %>
-      <% end %>
-    </div>
+      <div class="col-xs-2" data-hook="admin_product_price_form_currency">
+        <%= f.field_container :currency do %>
+          <%= f.label :currency %>
+          <%= f.select :currency,
+                      Money::Currency.all.map { |c| ["#{c.iso_code} (#{c.name})", c.iso_code] },
+                      {},
+                      class: "select2 fullwidth", disabled: !f.object.new_record? %>
+        <% end %>
+      </div>
 
-    <div class="three columns" data-hook="admin_product_price_form_country">
-      <%= f.field_container :country do %>
-        <%= f.label :country %>
-        <%= f.field_hint :country %>
-        <%= f.collection_select :country_iso, available_countries, :iso, :name,
-                                {
-                                  include_blank: t(:any_country, scope: [:spree, :admin, :prices]),
-                                  selected: Spree::Config.admin_vat_country_iso
-                                },
-                                { class: 'select2 fullwidth', disabled: !f.object.new_record? } %>
-      <% end %>
-    </div>
+      <div class="col-xs-2" data-hook="admin_product_price_form_country">
+        <%= f.field_container :country do %>
+          <%= f.label :country %>
+          <%= f.field_hint :country %>
+          <%= f.collection_select :country_iso, available_countries, :iso, :name,
+                                  {
+                                    include_blank: t(:any_country, scope: [:spree, :admin, :prices]),
+                                    selected: Spree::Config.admin_vat_country_iso
+                                  },
+                                  { class: 'select2 fullwidth', disabled: !f.object.new_record? } %>
+        <% end %>
+      </div>
 
-    <div class="three columns" data-hook="admin_product_price_form_amount">
-      <%= f.field_container :price do %>
-        <%= f.label :price %>
-        <%= f.text_field :price, value: f.object.money.format, class: 'fullwidth title' %>
-      <% end %>
-    </div>
-
-    <div class="field three columns checkbox omega" data-hook="is_default_price">
-      <%= f.label :is_default do %>
-        <%= f.check_box :is_default %>
-        <%= Spree::Price.human_attribute_name(:is_default) %>
-      <% end %>
-    </div>
+      <div class="col-xs-2" data-hook="admin_product_price_form_amount">
+        <%= f.field_container :price do %>
+          <%= f.label :price %>
+          <%= f.text_field :price, value: f.object.money.format, class: 'fullwidth title' %>
+        <% end %>
+      </div>
   </div>
+
 </div>
 
 <div class="clear"></div>

data/app/views/spree/admin/prices/_master_variant_table.html.erb

@@ -0,0 +1,41 @@
+<div class="row">
+  <div class="col-xs-12">
+    <fieldset class="no-border-bottom <%= "no-border-top" if !variants %>">
+      <% if variants %>
+        <legend align="center"><%= I18n.t(:master_variant, scope: :spree) %> <%= admin_hint I18n.t(:master_variant, scope: :spree), I18n.t(:master_variant, scope: [:spree, :hints, "spree/price"]) %></legend>
+      <% end %>
+      <table class="index master_prices">
+        <colgroup>
+          <col style="width: 30%">
+          <col style="width: 30%">
+          <col style="width: 20%">
+          <col style="width: 20%">
+        </colgroup>
+        <thead data-hook="master_prices_header">
+          <tr>
+            <th><%= Spree::Price.human_attribute_name(:country) %></th>
+            <th><%= Spree::Price.human_attribute_name(:currency) %></th>
+            <th><%= Spree::Price.human_attribute_name(:amount) %></th>
+            <th class="actions"></th>
+          </tr>
+        </thead>
+        <% master_prices.each do |price| %>
+          <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %> <%= cycle('odd', 'even')%>">
+            <td><%= price.display_country %></td>
+            <td><%= price.currency %></td>
+            <td class="align-right"><%= price.money.to_html %></td>
+            <td class="actions">
+              <% if can?(:update, price) %>
+                <%= link_to_edit(price, :no_text => true) unless price.deleted? %>
+              <% end %>
+              <% if can?(:destroy, price) %>
+                &nbsp;
+                <%= link_to_delete(price, :no_text => true) unless price.deleted? %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </table>
+    </fieldset>
+  </div>
+</div>

data/app/views/spree/admin/prices/_table.html.erb

@@ -1,35 +1,37 @@
-<%= paginate prices, theme: "solidus_admin" %>
+<%= paginate variant_prices, theme: "solidus_admin" %>
 
-<table class="index prices">
-  <thead data-hook="prices_header">
-    <tr>
-      <th><%= Spree::Variant.model_name.human %> </th>
-      <th><%= Spree::Price.human_attribute_name(:country) %></th>
-      <th><%= Spree::Price.human_attribute_name(:currency) %></th>
-      <th><%= Spree::Price.human_attribute_name(:amount) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
+<fieldset class="no-border-bottom">
+  <legend align="center"><%= I18n.t(:variant_pricing, scope: :spree) %></legend>
+  <table class="index prices">
+    <thead data-hook="prices_header">
+      <tr>
+        <th><%= Spree::Variant.model_name.human %> </th>
+        <th><%= Spree::Price.human_attribute_name(:country) %></th>
+        <th><%= Spree::Price.human_attribute_name(:currency) %></th>
+        <th><%= Spree::Price.human_attribute_name(:amount) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% variant_prices.each do |price| %>
+        <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %> <%= cycle('odd', 'even')%>">
+          <td><%= price.variant.descriptive_name %></td>
+          <td><%= price.display_country %></td>
+          <td><%= price.currency %></td>
+          <td class="align-right"><%= price.money.to_html %></td>
+          <td class="actions">
+            <% if can?(:update, price) %>
+              <%= link_to_edit(price, :no_text => true) unless price.deleted? %>
+            <% end %>
+            <% if can?(:destroy, price) %>
+              &nbsp;
+              <%= link_to_delete(price, :no_text => true) unless price.deleted? %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</fieldset>
 
-  <tbody>
-  <% prices.each do |price| %>
-    <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %> <%= cycle('odd', 'even')%>">
-      <td><%= price.variant.descriptive_name %></td>
-      <td><%= price.display_country %>
-      <td><%= price.currency %></td>
-      <td class="align-right"><%= price.money.to_html %></td>
-      <td class="actions">
-        <% if can?(:update, price) %>
-          <%= link_to_edit(price, :no_text => true) unless price.deleted? %>
-        <% end %>
-        <% if can?(:destroy, price) %>
-          &nbsp;
-          <%= link_to_delete(price, :no_text => true) unless price.deleted? %>
-        <% end %>
-      </td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<%= paginate prices, theme: "solidus_admin" %>
+<%= paginate variant_prices, theme: "solidus_admin" %>

data/app/views/spree/admin/prices/index.html.erb

@@ -14,50 +14,51 @@
 <div data-hook="admin_product_prices_index_search">
   <%= search_form_for [:admin, :product, @search] do |f| %>
 
-  <div class="alpha four columns">
-    <div class="field" data-hook="sku-select">
-      <%= label_tag :q_variant_id_eq, Spree::Variant.model_name.human %>
-      <%= f.select :variant_id_eq,
-                   @product.variants_including_master.map { |v| [v.descriptive_name, v.id] },
-                   {include_blank: true},
-                   class: "select2 fullwidth" %>
+  <div class="row">
+    <div class="col-xs-4">
+      <div class="field" data-hook="sku-select">
+        <%= label_tag :q_variant_id_eq, Spree::Variant.model_name.human %>
+        <%= f.select :variant_id_eq,
+                    @product.variants_including_master.map { |v| [v.descriptive_name, v.id] },
+                    {include_blank: true},
+                    class: "select2 fullwidth" %>
+      </div>
     </div>
-  </div>
 
-  <div class="three columns">
-    <div class="field" data-hook="currency-select">
-      <%= label_tag :q_currency_eq, Spree::Price.human_attribute_name(:currency) %>
-      <%= f.select :currency_eq,
-                   @prices.map(&:currency).uniq,
-                   {include_blank: true},
-                   class: "select2 fullwidth" %>
+    <div class="col-xs-2">
+      <div class="field" data-hook="currency-select">
+        <%= label_tag :q_currency_eq, Spree::Price.human_attribute_name(:currency) %>
+        <%= f.select :currency_eq,
+                    @prices.map(&:currency).uniq,
+                    {include_blank: true},
+                    class: "select2 fullwidth" %>
+      </div>
     </div>
-  </div>
 
-  <div class="three columns">
-    <div class="field" data-hook="country-select">
-      <%= label_tag :q_country_iso_eq, Spree::Price.human_attribute_name(:country) %>
-      <%= f.select :country_iso_eq,
-                   @prices.map(&:country).compact.uniq.map { |c| [c.name, c.iso]},
-                   {include_blank: true},
-                   class: "select2 fullwidth" %>
+    <div class="col-xs-2">
+      <div class="field" data-hook="country-select">
+        <%= label_tag :q_country_iso_eq, Spree::Price.human_attribute_name(:country) %>
+        <%= f.select :country_iso_eq,
+                    @prices.map(&:country).compact.uniq.map { |c| [c.name, c.iso]},
+                    {include_blank: true},
+                    class: "select2 fullwidth" %>
+      </div>
     </div>
-  </div>
 
-  <div class="three columns">
-    <div class="field">
-      <%= label_tag :q_amount_gt, t(".amount_greater_than") %>
-      <%= f.text_field :amount_gt %>
+    <div class="col-xs-2">
+      <div class="field">
+        <%= label_tag :q_amount_gt, t(".amount_greater_than") %>
+        <%= f.text_field :amount_gt %>
+      </div>
     </div>
-  </div>
 
-  <div class="omega three columns">
-    <div class="field">
-      <%= label_tag :q_amount_lt, t(".amount_less_than") %>
-      <%= f.text_field :amount_lt %>
+    <div class="col-xs-2">
+      <div class="field">
+        <%= label_tag :q_amount_lt, t(".amount_less_than") %>
+        <%= f.text_field :amount_lt %>
+      </div>
     </div>
   </div>
-
   <div class="clearfix"></div>
 
   <div class="actions filter-actions">
@@ -70,4 +71,5 @@
 </div>
 <% end %>
 
-<%= render 'table', prices: @prices %>
+<%= render 'master_variant_table', master_prices: @master_prices, variants: @product.variants.any? %>
+<%= render 'table', variant_prices: @variant_prices if @product.variants.any? %>

data/app/views/spree/admin/product_properties/index.html.erb

@@ -9,11 +9,6 @@
       <li>
         <%= link_to_add_fields Spree.t(:add_product_properties), 'tbody#product_properties', :class => 'plus button' %>
       </li>
-      <li>
-        <span id="new_ptype_link">
-          <%= link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, :remote => true, :class => 'button fa fa-copy' %>
-        </span>
-      </li>
     </ul>
   <% end %>
 <% end %>
@@ -23,8 +18,6 @@
     <legend align="center"><%= plural_resource_name(Spree::ProductProperty) %></legend>
     <div class="add_product_properties" data-hook="add_product_properties"></div>
 
-    <div id="prototypes" data-hook></div>
-
     <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
       <thead>
         <tr data-hook="product_properties_header">