spree_backend 4.2.0.beta → 4.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc4f2d5750b293520a8a21217d942cc3a38d86af4ef487fc9d204da072f117e3
-  data.tar.gz: cbb317652c1dee99b98d8bd4de82a841dd5a121471962e2f4cf1c6896e2ab2cd
+  metadata.gz: fd66fb6fa4c26e09eec76a0c48d70fefc870615eee858e1e6d9b7329e06adc74
+  data.tar.gz: 3c859535b7b1e606c5477354d6fe5fb36b1d13e61456024e339d58ecf17fadb5
 SHA512:
-  metadata.gz: e2e9c2cdb781e80c45e11c37d78bc3a37756c42f8cdeb4dc955f06d0d687f4be1aac3a527f660450029983954d205f0640a5bb2ce51c71543315429f601e449a
-  data.tar.gz: e69348a0b3af344d2a6657ecba8f876010454751a7901bed660116a7b11fa885942cfdd1386856c3d36a54d2354f90f6f0738593adfcfcff750b8c02081d6026
+  metadata.gz: 2a8c12edc73c766fd9c96de625ea6141af5535c55667e6e7d17f2414a56be8ad3463d45c48dd5aff35abceb7f89a07145c271512e7b05cdeab24d2d3a1271157
+  data.tar.gz: 9033d1be3fe6f19793df6aa606e8a75e0723a81d8466def2d556af311c2da9dbea7aa8e5205e15ba0c43b5b29207803437916baf75e99e4027ab01f315dfce24

data/app/assets/javascripts/spree/backend/admin.js

@@ -123,13 +123,15 @@ jQuery(function ($) {
   $('.js-filterable').each(function () {
     var $this = $(this)
 
-    if ($this.val()) {
+    if ($this.val() !== null && $this.val() !== '' && $this.val().length !== 0) {
       var ransackValue, filter
       var ransackFieldId = $this.attr('id')
       var label = $('label[for="' + ransackFieldId + '"]')
 
       if ($this.is('select')) {
-        ransackValue = $this.find('option:selected').text()
+        ransackValue = $this.find('option:selected').toArray().map(function (option) {
+          return option.text;
+        }).join(', ')
       } else {
         ransackValue = $this.val()
       }

data/app/controllers/spree/admin/adjustments_controller.rb

@@ -11,6 +11,8 @@ module Spree
 
       before_action :find_adjustment, only: [:destroy, :edit, :update]
 
+      after_action :delete_promotion_from_order, only: [:destroy], if: -> { @adjustment.destroyed? && @adjustment.promotion? }
+
       def index
         @adjustments = @order.all_adjustments.eligible.order(created_at: :asc)
       end
@@ -31,6 +33,12 @@ module Spree
       def build_resource
         parent.adjustments.build(order: parent)
       end
+
+      def delete_promotion_from_order
+        return if @adjustment.source.nil?
+
+        @order.promotions.delete(@adjustment.source.promotion)
+      end
     end
   end
 end

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

@@ -19,6 +19,16 @@
         <%= f.error_message_on :logo %>
       <% end %>
     <% end %>
+    <%= f.field_container :mailer_logo, class: ['form-group'] do %>
+      <% if @store.mailer_logo.attached? && @store.mailer_logo.variable? %>
+        <%= image_tag main_app.url_for(@store.mailer_logo.variant(resize: '244x104>')) %>
+      <% end %>
+      <%= f.field_container :mailer_logo, class: ['form-group'] do %>
+        <%= f.label :mailer_logo, Spree.t(:mailer_logo) %><br />
+        <%= f.file_field :mailer_logo, accept: 'image/png, image/jpeg' %>
+        <%= f.error_message_on :mailer_logo %>
+      <% end %>
+    <% end %>
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
       <%= f.text_field :name, class: 'form-control', required: true %>
@@ -112,8 +122,8 @@
       <%= f.error_message_on :default_locale %>
     <% end %>
     <%= f.field_container :default_country_id, class: ['form-group'] do %>
-      <%= f.label :default_country_id, Spree.t('i18n.country') %>
-      <%= f.select :default_country_id, options_from_collection_for_select(@countries, :id, :name, @store.default_country_id), {}, { class: 'select2' } %>
+      <%= f.label :default_country_id, Spree.t('i18n.default_country') %>
+      <%= f.select :default_country_id, options_from_collection_for_select(@countries, :id, :name, @store.default_country_id || Spree::Config[:default_country_id]), {}, { class: 'select2' } %>
       <%= f.error_message_on :default_country_id %>
     <% end %>
   </div>

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta
+  version: 4.2.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 - Spark Solutions
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -651,10 +651,10 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.beta
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc1
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.beta
-post_install_message: 
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc1
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -670,8 +670,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.
 test_files: []