From dd7b7178946e28d87054788aef4f9aad402edcb9 Mon Sep 17 00:00:00 2001
From: Alessio Rocco <alessio.rocco.lt@gmail.com>
Date: Mon, 18 Jan 2016 12:59:14 +0100
Subject: [PATCH 1/2] fixes product and variant prices fields

---
 .../spree/admin/products_controller_decorator.rb   |  2 +-
 .../products/_form/price_lists.html.erb.deface     | 12 ------------
 .../variants/_form/price_lists.html.erb.deface     |  6 ------
 .../spree/admin/shared/_price_list_fields.html.erb | 14 ++++++--------
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/app/controllers/spree/admin/products_controller_decorator.rb b/app/controllers/spree/admin/products_controller_decorator.rb
index 4a78f04..61df25c 100644
--- a/app/controllers/spree/admin/products_controller_decorator.rb
+++ b/app/controllers/spree/admin/products_controller_decorator.rb
@@ -10,7 +10,7 @@ def price_lists
 
   def build_prices
     Spree::PriceList.where.not(id: price_list_ids).each do |pl|
-      @object.master.prices.build(price_list: pl) unless pl.default?
+      @object.master.prices.build(price_list: pl)
     end
   end
 
diff --git a/app/overrides/spree/admin/products/_form/price_lists.html.erb.deface b/app/overrides/spree/admin/products/_form/price_lists.html.erb.deface
index 2361dad..cf62232 100644
--- a/app/overrides/spree/admin/products/_form/price_lists.html.erb.deface
+++ b/app/overrides/spree/admin/products/_form/price_lists.html.erb.deface
@@ -1,17 +1,5 @@
 <!-- replace_contents "[data-hook='admin_product_form_price']" -->
 
-<%= f.field_container :price, class: ['form-group'] do %>
-  <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', class: "required")) %>
-
-  <div class="input-group">
-    <div class="input-group-addon"><%= @product.master.default_price.price_list.name %></div>
-    <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', disabled: (cannot? :update, Spree::Price) %>
-    <div class="input-group-addon"><%= @product.master.default_price.price_list.currency %></div>
-  </div>
-
-  <%= f.error_message_on :price %>
-<% end %>
-
 <%= f.fields_for :master do |fm| %>
   <%= render partial: 'spree/admin/shared/price_list_fields', locals: { f: fm } %>
 <% end %>
diff --git a/app/overrides/spree/admin/variants/_form/price_lists.html.erb.deface b/app/overrides/spree/admin/variants/_form/price_lists.html.erb.deface
index 0e72f60..02b9f56 100644
--- a/app/overrides/spree/admin/variants/_form/price_lists.html.erb.deface
+++ b/app/overrides/spree/admin/variants/_form/price_lists.html.erb.deface
@@ -2,10 +2,4 @@
 
 <%= f.label :price, Spree.t(:price) %>
 
-<div class="input-group">
-  <div class="input-group-addon"><%= @variant.default_price.price_list.name %></div>
-  <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => ''), :class => 'form-control' %>
-  <div class="input-group-addon"><%= @variant.default_price.price_list.currency %></div>
-</div>
-
 <%= render partial: 'spree/admin/shared/price_list_fields', locals: { f: f } %>
diff --git a/app/views/spree/admin/shared/_price_list_fields.html.erb b/app/views/spree/admin/shared/_price_list_fields.html.erb
index b780176..04882bb 100644
--- a/app/views/spree/admin/shared/_price_list_fields.html.erb
+++ b/app/views/spree/admin/shared/_price_list_fields.html.erb
@@ -1,12 +1,10 @@
 <%= f.fields_for :prices do |fp| %>
   <div class="form-group">
-    <% unless fp.object.price_list.default? %>
-      <%= fp.hidden_field :price_list_id %>
-      <div class="input-group">
-        <div class="input-group-addon"><%= fp.object.price_list.name %></div>
-        <%= fp.text_field :amount, :class => 'form-control' %>
-        <div class="input-group-addon"><%= fp.object.price_list.currency %></div>
-      </div>
-    <% end %>
+    <%= fp.hidden_field :price_list_id %>
+    <div class="input-group">
+      <div class="input-group-addon"><%= fp.object.price_list.name %></div>
+      <%= fp.text_field :amount, :class => 'form-control' %>
+      <div class="input-group-addon"><%= fp.object.price_list.currency %></div>
+    </div>
   </div>
 <% end %>

From 83825a5c1451aa41d5e69af0fb5aab5d041e955a Mon Sep 17 00:00:00 2001
From: Paolo Tatone <paolo.tatone@gmail.com>
Date: Thu, 21 Jan 2016 17:40:49 +0100
Subject: [PATCH 2/2] adds translation

---
 config/locales/en_price_lists.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config/locales/en_price_lists.yml b/config/locales/en_price_lists.yml
index 0f8d398..e2b660a 100644
--- a/config/locales/en_price_lists.yml
+++ b/config/locales/en_price_lists.yml
@@ -14,3 +14,10 @@ en:
         internal_name: Internal Name
         currency: Currency
         position: Position
+        default: Default
+    errors:
+      models:
+        spree/line_item:
+          attributes:
+            price_list:
+              must_match_price_list: The price list does not match