spree_price 3.1.9 → 3.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7c9e9826f085ba64077993f1e7fc6ebd22a394e22f34d74015dd2615859075
-  data.tar.gz: ea3f831bdf357079452eb416ec4637de452d26554cd53a8aad5c6109186491da
+  metadata.gz: d975632768624c47af1a7d806b1450a768b778799578fab4cc0fc4d2baf20dc2
+  data.tar.gz: eceaff649dd082013ab32c9aa7066b9990cbea607e43d2560ac1b8dff3bbbd9a
 SHA512:
-  metadata.gz: 6caff35150f264472afebc1da992892b155d1b98acb2e20fabcd1d0e9edcd1ab24023ba2b4e1ac2006888867eff7f72e06173982bf19f41317fbdda8967389be
-  data.tar.gz: c4205773287dcbeac33dc0cb8b6d9230fb9852476546d8234016712bca56c819306ad487b7a7e7811bad62d6b3ce96ef2bdb754f9027226a9e9d7c81ff8f294e
+  metadata.gz: b864514c1887280da081dbd8cbc3501b6a0472d5efa6a1951bc4cb3526721a0d07f202d3f74ab7ad14291fdc770d3ae56e74f587fb84c1f079d05ac8a1a72428
+  data.tar.gz: 3e64a847c2d4745c03b04a662050079331fddbb5c982d5286811d7123e87fd7b24d9efa1e2b189ff067df6f74103024a1f227a85c8fdee1835e5df7713b1b822

data/app/models/spree/line_item_decorator.rb

@@ -21,7 +21,7 @@ Spree::LineItem.class_eval do
     line_item_price = line_item_prices.find do |line_item_price|
       line_item_price.price_type_id == price_type.id
     end
-    line_item_price || line_item_prices.build({ price_type_id: price_type.id })
+    line_item_price || line_item_prices.build({ price_type_id: price_type.id, amount: variant_price_by_price_type(price_type) })
   end
 
   def default_line_item_price

data/app/models/spree/variant_decorator.rb

@@ -24,7 +24,7 @@ Spree::Variant.class_eval do
   )
     price_book_price = price_in_price_book(currency, store, roles, price_type)
 
-    logger.warn("Variant #{sku} price cannot be found in store #{store.try(:code)} "\
+    logger.warn("Variant #{sku} price #{price_type.try(:name)} cannot be found in store #{store.try(:code)} "\
       "in #{currency} with roles #{roles.try(:compact).try(:flat_map, &:name)}") if price_book_price.nil?
 
     price_book_price ||

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

@@ -42,7 +42,7 @@
 
     <div class="col-md-6">
       <%= f.field_container :active_to do %>
-        <%= f.label :active_to %> <span class="required">*</span><br />
+        <%= f.label :active_to %>
         <%= f.text_field :active_to, class: 'form-control datepicker datepicker-to' %>
         <%= f.error_message_on :active_to %>
       <% end %>

data/app/views/spree/admin/price_books/_price_book.html.erb

@@ -5,8 +5,8 @@
   </colgroup>
   <tbody>
     <tr><td><%= Spree.t(:currency) %></td><td><%= price_book.currency %></td></tr>
-    <tr><td><%= Spree.t(:active_from) %></td><td><%= I18n.l price_book.active_from %></td></tr>
-    <tr><td><%= Spree.t(:active_to) %></td><td><%= I18n.l price_book.active_to %></td></tr>
+    <tr><td><%= Spree.t(:active_from) %></td><td><%= price_book.active_from ? I18n.l(price_book.active_from) : '--' %></td></tr>
+    <tr><td><%= Spree.t(:active_to) %></td><td><%= price_book.active_to ? I18n.l(price_book.active_to) : '--' %></td></tr>
     <tr><td><%= Spree.t(:price_adjustment_factor) %></td><td><%= price_book.price_adjustment_factor %></td></tr>
     <tr><td><%= Spree.t(:parent) %></td><td><%= price_book.parent.try(:name) || '--' %></td></tr>
     <tr><td><%= Spree.t(:price_type) %></td><td><%= price_book.price_type.try(:name) %></td></tr>

data/lib/spree_price/version.rb

@@ -10,7 +10,7 @@ module SpreePrice
   module VERSION
     MAJOR = 3
     MINOR = 1
-    TINY  = 9
+    TINY  = 12
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_price
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.1.12
 platform: ruby
 authors:
 - Charles Wong