solidus_volume_pricing 0.2.1 → 1.0.0

data/app/overrides/spree/admin/shared/_settings_sub_menu/add_volume_price_model_admin_menu_links.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_bottom "[data-hook='admin_settings_sub_tabs']" -->
+
+<% if can?(:admin, Spree::VolumePriceModel) %>
+  <%= tab :volume_price_models, url: spree.admin_volume_price_models_path %>
+<% end %>

data/app/overrides/views_decorator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Deface::Override.new(
   virtual_path: 'spree/admin/shared/_product_tabs',
   name: 'add_volume_pricing_admin_tab',

data/app/views/spree/admin/shared/_vp_product_tab.html.erb

@@ -1,3 +1,3 @@
-<%= content_tag :li, class: ('active' if current == Spree.t(:volume_pricing)) do %>
-  <%= link_to_with_icon 'tasks', Spree.t(:volume_pricing), volume_prices_admin_product_variant_url(@product, @product.master) %>
+<%= content_tag :li, class: ('active' if current == t('spree.volume_pricing')) do %>
+  <%= link_to t('spree.volume_pricing'), volume_prices_admin_product_variant_url(@product, @product.master) %>
 <% end %>

data/app/views/spree/admin/variants/_edit_fields.html.erb

@@ -1,33 +1,6 @@
-<% content_for :page_actions do %>
-  <span id="new_add_volume_price" data-hook>
-    <%= button_link_to Spree.t(:add_volume_price), 'javascript:;', {
-      icon: 'add', :'data-target' => 'tbody#volume_prices', class: 'btn-success spree_add_fields', id: 'add_volume_price' } %>
-  </span>
-<% end %>
+<fieldset>
+  <legend><%= t('spree.volume_prices') %></legend>
 
-<h3><%= Spree.t(:volume_prices) %></h3>
-<table class="table">
-  <thead>
-    <tr>
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:discount_type) %></th>
-      <th><%= Spree.t(:range) %></th>
-      <th><%= Spree.t(:amount) %></th>
-      <th><%= Spree.t(:position) %></th>
-      <th><%= Spree.t(:role) %></th>
-      <th><%= Spree.t(:action) %></th>
-    </tr>
-  </thead>
-  <tbody id="volume_prices">
-    <%= f.fields_for :volume_prices do |vp_form| %>
-      <%= render partial: 'spree/admin/volume_prices/volume_price_fields', locals: { f: vp_form } %>
-    <% end %>
-  </tbody>
-  <tbody id="volume_price_models">
-    <%= f.field_container :volume_price_model, class: ['form-group'] do %>
-      <%= f.label :volume_price_model_id, Spree.t(:volume_price_model) %>
-      <%= f.collection_select(:volume_price_model_ids, Spree::VolumePriceModel.all, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2', disabled: (cannot? :edit, Spree::VolumePriceModel) }) %>
-    <%= f.error_message_on :volume_price_model %>
-    <% end %>
-  </tbody>
-</table>
+  <%= render 'spree/admin/volume_price_models/select', f: f %>
+  <%= render 'spree/admin/volume_prices/table', f: f %>
+</fieldset>

data/app/views/spree/admin/variants/volume_prices.html.erb

@@ -1,39 +1,12 @@
-<%= render 'spree/admin/shared/product_tabs', current: Spree.t(:volume_pricing) %>
+<%= render 'spree/admin/shared/product_tabs', current: t('spree.volume_pricing') %>
 <%= render 'spree/shared/error_messages', target: @variant %>
 
-<% content_for :page_actions do %>
-  <span id="new_add_volume_price" data-hook>
-    <%= button_link_to Spree.t(:add_volume_price), 'javascript:;', {
-      icon: 'add', :'data-target' => 'tbody#volume_prices', class: 'btn-success spree_add_fields', id: 'add_volume_price'} %>
-  </span>
-<% end %>
+<fieldset>
+  <legend><%= t('spree.volume_prices') %></legend>
 
-<%= form_for(@variant, url: admin_product_variant_path(@product, @variant), html: { method: :put }) do |f| %>
-  <h3><%= Spree.t(:volume_prices) %></h3>
-  <table class="table">
-    <thead>
-      <tr>
-        <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:discount_type) %></th>
-        <th><%= Spree.t(:range) %></th>
-        <th><%= Spree.t(:amount) %></th>
-        <th><%= Spree.t(:position) %></th>
-        <th><%= Spree.t(:role) %></th>
-        <th class="actions"></th>
-      </tr>
-    </thead>
-    <tbody id="volume_prices">
-      <%= f.fields_for :volume_prices do |vp_form| %>
-        <%= render partial: 'spree/admin/volume_prices/volume_price_fields', locals: { f: vp_form } %>
-      <% end %>
-    </tbody>
-    <tbody id="volume_price_models">
-      <%= f.field_container :volume_price_model, class: ['form-group'] do %>
-        <%= f.label :volume_price_model_id, Spree.t(:volume_price_model) %>
-        <%= f.collection_select(:volume_price_model_ids, Spree::VolumePriceModel.all, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2', disabled: (cannot? :edit, Spree::VolumePriceModel) }) %>
-      <%= f.error_message_on :volume_price_model %>
-      <% end %>
-    </tbody>
-  </table>
-  <%= render 'spree/admin/shared/edit_resource_links' %>
-<% end %>
+  <%= form_for(@variant, url: admin_product_variant_path(@product, @variant), html: { method: :put }) do |f| %>
+    <%= render 'spree/admin/volume_price_models/select', f: f %>
+    <%= render 'spree/admin/volume_prices/table', f: f %>
+    <%= render 'spree/admin/shared/edit_resource_links' %>
+  <% end %>
+</fieldset>

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

@@ -1,9 +1,13 @@
 <div data-hook="admin_inside_volume_price_model_form" class="form-group">
   <%= f.field_container :name, class: ['form-group'] do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+    <%= f.label :name, t('spree.name') %> <span class="required">*</span>
     <%= error_message_on :volume_price_model, :name, :class => 'error-message' %>
     <%= text_field :volume_price_model, :name, :class => 'form-control' %>
   <% end %>
 
-  <%= render 'spree/admin/volume_prices/edit_fields', f: f %>
+  <fieldset>
+    <legend><%= t('spree.volume_prices') %></legend>
+
+    <%= render 'spree/admin/volume_prices/table', f: f %>
+  </fieldset>
 </div>

data/app/views/spree/admin/volume_price_models/_list.html.erb

@@ -1,8 +1,8 @@
-<table class="table sortable" id='listing_volume_price_models' data-hook data-sortable-link="<%#= update_positions_admin_volume_price_models_url %>">
+<table class="table sortable" id='listing_volume_price_models' data-hook>
   <thead>
     <tr data-hook="volume_price_models_header">
       <th class="no-border"></th>
-      <th><%= Spree.t(:name) %></th>
+      <th><%= t('spree.name') %></th>
       <th class="actions"></th>
     </tr>
   </thead>
@@ -14,8 +14,12 @@
         </td>
         <td><%= price_model.name %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit price_model.id, no_text: true %>
-          <%= link_to_delete price_model, no_text: true %>
+          <% if can?(:update, price_model) %>
+            <%= link_to_edit price_model, no_text: true %>
+          <% end %>
+          <% if can?(:destroy, price_model) %>
+            <%= link_to_delete price_model, no_text: true %>
+          <% end %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/volume_price_models/_select.html.erb

@@ -0,0 +1,17 @@
+<div class="row">
+  <div class="col-4">
+    <%= f.field_container :volume_price_model, class: ['form-group'] do %>
+      <%= f.label :volume_price_model_id, t('spree.volume_price_model') %>
+      <%= f.collection_select :volume_price_model_ids,
+        Spree::VolumePriceModel.all, :id, :name,
+        {
+          include_blank: t('spree.match_choices.none')
+        },
+        {
+          class: 'custom-select fullwidth',
+          disabled: cannot?(:edit, Spree::VolumePriceModel)
+        } %>
+      <%= f.error_message_on :volume_price_model %>
+    <% end %>
+  </div>
+</div>

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

@@ -1,12 +1,13 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:volume_price_model_edit) %>
+  <%= t('spree.volume_price_model_edit') %>
 <% end %>
 
-<%= form_for [:admin, @volume_price_model] do |f| %>
-  <fieldset>
-    <%= render partial: 'form', locals: { f: f } %>
-  </fieldset>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::VolumePriceModel), admin_volume_price_models_path) %>
 
-  <%= render 'spree/admin/shared/edit_resource_links' %>
+<%= form_for [:admin, @volume_price_model] do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
 
+  <% if can?(:update, @volume_price_model) %>
+    <%= render 'spree/admin/shared/edit_resource_links' %>
+  <% end %>
 <% end %>

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

@@ -1,9 +1,9 @@
 <% content_for :page_title do %>
-  <%= "Volume Price Models" %>
+  <%= plural_resource_name(Spree::VolumePriceModel) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_volume_price_model), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_volume_price_model_link' %>
+  <%= link_to t('spree.new_volume_price_model'), new_object_url, class: "btn btn-primary", id: 'admin_new_volume_price_model_link' %>
 <% end %>
 
 <% if @volume_price_models.any? %>
@@ -11,8 +11,10 @@
     <%= render 'list' %>
   </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: "Volume Price Models") %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+  <div class="no-objects-found">
+    <%= t('spree.no_resource_found', resource: plural_resource_name(Spree::VolumePriceModel)) %>,
+    <% if can? :create, Spree::VolumePriceModel %>
+      <%= link_to t('spree.create_one'), new_object_url %>
+    <% end %>
   </div>
 <% end %>

data/app/views/spree/admin/volume_price_models/new.html.erb

@@ -1,12 +1,12 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:new_volume_price_model) %>
+  <%= t('spree.new_volume_price_model') %>
 <% end %>
 
+<% admin_breadcrumb(link_to plural_resource_name(Spree::VolumePriceModel), admin_volume_price_models_path) %>
+
 <%= form_for [:admin, @volume_price_model] do |f| %>
-  <fieldset>
+  <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
-    <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t(:create), 'save' %>
-    </div>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -0,0 +1,26 @@
+<table class="table">
+  <thead>
+    <tr>
+      <th><%= t('spree.name') %></th>
+      <th><%= t('spree.discount_type') %></th>
+      <th><%= t('spree.range') %></th>
+      <th><%= t('spree.amount') %></th>
+      <th><%= t('spree.position') %></th>
+      <th><%= t('spree.role') %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody id="volume_prices">
+    <%= f.fields_for :volume_prices do |vp_form| %>
+      <%= render partial: 'spree/admin/volume_prices/volume_price_fields', locals: { f: vp_form } %>
+    <% end %>
+  </tbody>
+</table>
+
+<span id="new_add_volume_price" data-hook>
+  <%= link_to t(:add_volume_price, scope: :spree), 'javascript:;', {
+    data: { target: 'tbody#volume_prices' },
+    class: 'btn btn-primary spree_add_fields',
+    id: 'add_volume_price'
+  } %>
+</span>

data/app/views/spree/admin/volume_prices/_volume_price_fields.html.erb

@@ -6,10 +6,10 @@
   <td>
     <%= error_message_on(f.object, :discount_type) %>
     <%= f.select :discount_type, [
-        ["#{Spree.t(:total_price)}", 'price'],
-        ["#{Spree.t(:percent_discount)}", 'percent'],
-        ["#{Spree.t(:price_discount)}", 'dollar']
-      ], { include_blank: true }, class: 'select2' %>
+        [t('spree.total_price'), 'price'],
+        [t('spree.percent_discount'), 'percent'],
+        [t('spree.price_discount'), 'dollar']
+      ], { include_blank: true }, class: 'custom-select' %>
   </td>
   <td>
     <%= error_message_on(f.object, :range) %>
@@ -25,9 +25,9 @@
   </td>
   <td>
     <%= error_message_on(f.object, :role_id) %>
-    <%= f.collection_select(:role_id, Spree::Role.all, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+    <%= f.collection_select(:role_id, Spree::Role.all, :id, :name, { include_blank: t('spree.match_choices.none') }, { class: 'custom-select' }) %>
   </td>
   <td class="actions">
-    <%= link_to_remove_fields Spree.t(:remove), f, no_text: true %>
+    <%= link_to_remove_fields t('spree.remove'), f, no_text: true %>
   </td>
 </tr>

data/app/views/spree/products/_volume_pricing.html.erb

@@ -1,15 +1,15 @@
 <% display_percent ||= false %>
 <% if product.price > 0 and product.master.volume_prices.present? %>
   <div id="bulk-discount">
-    <h6><%= Spree.t(:bulk_discount) %></h6>
+    <h6><%= t('spree.bulk_discount') %></h6>
     <table class="table">
-    	<% product.master.volume_prices.each do |v| %>
-      	<%= content_tag(:tr) do %>
-        	<%= content_tag :td, (v.open_ended? ? v.range : "#{v.range.to_range.begin}–#{v.range.to_range.end}") %>
-        	<%= content_tag :td, Spree::Money.new(v.amount).to_s %>
-        	<%= content_tag(:td, '%i%' % ((1.0 - v.amount / product.master.price) * 100.0).round) if display_percent %>
-      	<% end %>
-    	<% end %>
+      <% product.master.volume_prices.each do |v| %>
+        <%= content_tag(:tr) do %>
+          <%= content_tag :td, v.display_range %>
+          <%= content_tag :td, Spree::Money.new(v.amount).to_s %>
+          <%= content_tag(:td, '%i%' % ((1.0 - v.amount / product.master.price) * 100.0).round) if display_percent %>
+        <% end %>
+      <% end %>
     </table>
   </div>
 <% end %>

data/bin/rails

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/solidus_volume_pricing/engine', __FILE__)
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/solidus_volume_pricing/engine', __dir__)
 
 require 'rails/all'
 require 'rails/engine/commands'

data/config/locales/de.yml

@@ -1,7 +1,7 @@
 ---
 de:
   spree:
-    add_volume_price: Neuen Staffelpreis
+    add_volume_price: Neuer Staffelpreis
     position: Position
     discount_type:
     range: Bereich
@@ -10,9 +10,23 @@ de:
     price_discount:
     percent_discount:
     bulk_discount:
+    admin:
+      tab:
+        volume_price_models: Staffelpreismodelle
   activerecord:
+    models:
+      spree/volume_price:
+        one: Staffelpreis
+        other: Staffelpreise
+      spree/volume_price_model:
+        one: Staffelpreismodell
+        other: Staffelpreismodelle
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} ist kein valider Staffelpreistyp'
       messages:
-        could_not_conver_to_range:
-        is_not_a_valid_volume_price_type:
+        could_not_convert_to_range:
         must_be_in_format:

data/config/locales/en.yml

@@ -5,14 +5,33 @@ en:
     position: Position
     discount_type: Discount Type
     range: Range
+    role: Role
     volume_prices: Volume Prices
+    volume_price_model: Volume Price Model
+    new_volume_price_model: New Volume Price Model
+    volume_price_model_edit: Edit Volume Price Model
     volume_pricing: Volume Pricing
     price_discount: Price Discount
     percent_discount: Percent Discount
     bulk_discount: Bulk Discount
+    total_price: Total price
+    admin:
+      tab:
+        volume_price_models: Volume Price Models
   activerecord:
+    models:
+      spree/volume_price:
+        one: Volume Price
+        other: Volume Prices
+      spree/volume_price_model:
+        one: Volume Price Model
+        other: Volume Price Models
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} is not a valid Volume Price Type'
       messages:
-        could_not_conver_to_range: "Couldn't convert to Range: %{number}"
-        is_not_a_valid_volume_price_type: '%{value} is not a valid Volume Price Type'
+        could_not_convert_to_range: "Couldn't convert to Range: %{range_string}"
         must_be_in_format: 'must be in one of the following formats: (a..b), (a...b), (a+)'

data/config/locales/pt.yml

@@ -12,7 +12,11 @@ pt:
     bulk_discount: Desconto por Quantidade
   activerecord:
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} is not a valid Volume Price Type'
       messages:
-        could_not_conver_to_range:
-        is_not_a_valid_volume_price_type:
+        could_not_convert_to_range:
         must_be_in_format:

data/config/locales/ru.yml

@@ -12,7 +12,11 @@ ru:
     bulk_discount:
   activerecord:
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} is not a valid Volume Price Type'
       messages:
-        could_not_conver_to_range:
-        is_not_a_valid_volume_price_type:
+        could_not_convert_to_range:
         must_be_in_format:

data/config/locales/sv.yml

@@ -12,7 +12,11 @@ sv:
     bulk_discount: Bulk rabatt
   activerecord:
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} är inte en giltligt typ för volympris'
       messages:
-        could_not_conver_to_range: "Det gick inte att konvertera till omfång: %{number}"
-        is_not_a_valid_volume_price_type: '%{value} är inte en giltligt typ för volympris'
+        could_not_convert_to_range: "Det gick inte att konvertera till omfång: %{range_string}"
         must_be_in_format: 'måste vara i ett av följande format: (a..b), (a...b), (a+)'

data/config/locales/tr.yml

@@ -12,7 +12,11 @@ tr:
     bulk_discount:
   activerecord:
     errors:
+      models:
+        spree/volume_price:
+          attributes:
+            discount_type:
+              inclusion: '%{value} is not a valid Volume Price Type'
       messages:
-        could_not_conver_to_range:
-        is_not_a_valid_volume_price_type:
+        could_not_convert_to_range:
         must_be_in_format: