solidus_backend 4.5.1 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7130001c5b3ccbd6cec823fc5a7115e3d8dda61d83bc0aae2ba85ced3d98272a
-  data.tar.gz: e5c0d4d67bb04cba1b3155ba70fce9fe213e0a61f20e8839111e6cff3a7c1809
+  metadata.gz: c65304083db4c655a29d3e3023906e338d6274067f157482657e7a979ca60fac
+  data.tar.gz: 22389566c4aa44ea193beeed9e65db2d64c46f0d5b8290a07594e2520c8d7f8b
 SHA512:
-  metadata.gz: '09017549f00cae27ee5c011f7d148a77cf6d470877f34e99aad44527e2ac01788f91dd258972b4a75bfa2980e0ac78246a884b14916e7f28c6d0ef86c03135f2'
-  data.tar.gz: 64884cb9999e915fa84768ab8bba317470e976085432a45f9eb444647f109cb90b2eb1b9afaafa201a766db6a0f71014f3c6ad8272f7afbfa3dc6fbf2d4cc4ba
+  metadata.gz: 8afb0210b73fcf9ca01cf57ea761a1820f5156abd9c93dabe5dc5ee22866afc1db5c5263f85cb0627a3a4cc98bb7582f4e255f09aaf468f308d74bd97e85cf41
+  data.tar.gz: 669532feea711782cf622022d99de0a12317a994601f50320025c0f3d174131b1ec19f8f89de5b727c0c60da351b7d6d2090dc3d9b288e3d5de8aa1a8b9f95f9

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

@@ -23,6 +23,7 @@ $.fn.optionValueAutocomplete = function (options) {
     },
     ajax: {
       url: Spree.pathFor('api/option_values'),
+      quietMillis: 500,
       datatype: 'json',
       data: function (term, page) {
         var productId = typeof(productSelect) !== 'undefined' ? $(productSelect).select2('val') : null;

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

@@ -35,6 +35,7 @@ $.fn.productAutocomplete = function (options) {
   this.select2({
     minimumInputLength: 3,
     multiple: multiple,
+    quietMillis: 500,
     initSelection: function (element, callback) {
       $.get(Spree.pathFor('admin/search/products'), {
         ids: element.val().split(','),

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

@@ -47,6 +47,7 @@ $.fn.taxonAutocomplete = function (options) {
       },
       ajax: {
         url: Spree.pathFor('api/taxons'),
+        quietMillis: 500,
         datatype: 'json',
         data: function (term, page) {
           return {

data/app/assets/javascripts/spree/backend/views/order/address.js

@@ -24,7 +24,7 @@ Spree.Views.Order.Address = Backbone.View.extend({
   eachField: function(callback){
     var view = this;
     var fields = ["name", "company", "address1", "address2",
-      "city", "zipcode", "phone", "country_id", "state_name"];
+      "city", "zipcode", "phone", "country_id", "state_name", "vat_id", "email", "reverse_charge_status"];
     _.each(fields, function(field) {
       var el = view.$('[name$="[' + field + ']"]');
       if (el.length) callback(field, el);

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

@@ -56,15 +56,19 @@
           </div>
           <div class="editing-hide">
             <% if payment.pending? %>
-              <%= link_to_with_icon 'edit', t('spree.actions.edit'), nil, no_text: true, class: "js-edit", data: {action: 'edit'} %>
+              <%= link_to_with_icon 'edit', t('spree.actions.edit'), nil, no_text: true, class: "js-edit", data: { action: 'edit' } %>
             <% end %>
-            <% allowed_actions = payment.actions.select { |a| can?(a.to_sym, payment) } %>
-            <% allowed_actions.each do |action| %>
+            <% payment.actions.each do |action| %>
+              <% next unless can?(action.to_sym, payment) %>
+
               <% if action == 'credit' %>
-                <%= link_to_with_icon 'mail-reply', t('spree.actions.refund'), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
-              <% elsif action == 'capture' && !@order.completed? %>
-                <%# no capture prior to completion. payments get captured when the order completes. %>
+                <% next if payment.invalid? || payment.failed? || payment.checkout? %>
+
+                <%= link_to_with_icon 'reply', t('spree.refund'), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
               <% else %>
+                <% next if action == 'capture' && !@order.completed? %>
+                <% next if action == 'void' && (payment.invalid? || payment.failed?) %>
+
                 <%= link_to_with_icon action, t(action, scope: 'spree'), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: {action: action} %>
               <% end %>
             <% end %>

data/app/views/spree/admin/search/users.json.jbuilder

@@ -14,7 +14,10 @@ json.array!(@users) do |user|
     :state_name,
     :state_id,
     :country_id,
-    :company
+    :company,
+    :email,
+    :vat_id,
+    :reverse_charge_status
   ]
   json.ship_address do
     if user.ship_address

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

@@ -1,6 +1,8 @@
 <div data-hook="address">
   <%= address.name %> <%= address.company unless address.company.blank? %><br>
   <%= address.phone %><%= address.alternative_phone unless address.alternative_phone.blank? %><br>
+  <%= address.email unless address.email.blank? %><br>
+  <%= address.vat_id unless address.vat_id.blank? %><br>
   <%= address.address1 %><br>
   <% if address.address2.present? %><%= address.address2 %><br><% end %>
   <%= "#{address.city}, #{address.state_text}, #{address.zipcode}" %><br>

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

@@ -63,4 +63,24 @@
     <%= f.label :phone %>
     <%= f.phone_field :phone, class: 'fullwidth' %>
   </div>
+
+  <div class="field <%= "#{type}-row" %>">
+    <%= f.label :email %>
+    <%= f.email_field :email, class: 'fullwidth' %>
+  </div>
+  
+  <% if Spree::Backend::Config.show_reverse_charge_fields %>
+    <div class="field <%= "#{type}-row" %>">
+      <%= f.label :vat_id %>
+      <%= f.text_field :vat_id, class: 'fullwidth' %>
+    </div>
+
+    <div class="field <%= "#{type}-row" %>">
+      <%= f.label :reverse_charge_status %>
+      <%= f.select :reverse_charge_status,
+          Spree::Address.reverse_charge_statuses.keys.map { |key| [I18n.t("spree.reverse_charge_statuses.#{key}"), key] },
+          { include_blank: false },
+          { class: 'custom-select fullwidth' } %>
+    </div>
+  <% end %>
 </div>

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

@@ -30,6 +30,17 @@
       <%= f.text_area :meta_description, class: 'fullwidth' %>
       <%= f.error_message_on :meta_description %>
     <% end %>
+
+    <% if Spree::Backend::Config.show_reverse_charge_fields %>
+      <%= f.field_container :reverse_charge_status do %>
+        <%= f.label :reverse_charge_status %>
+        <%= f.select :reverse_charge_status,
+          Spree::Store.reverse_charge_statuses.keys.map { |key| [I18n.t("spree.reverse_charge_statuses.#{key}"), key] },
+          { include_blank: false },
+          { class: 'custom-select fullwidth' } %>
+        <%= f.error_message_on :reverse_charge_status %>
+      <% end %>
+    <% end %>
   </div>
   <div class="col-12 col-md-6">
     <%= f.field_container :url do %>

data/lib/spree/backend_configuration.rb

@@ -19,6 +19,10 @@ module Spree
       solidus_admin: 'spree/backend/themes/solidus_admin'
     }
 
+    # @!attribute [rw] show_reverse_charge_fields
+    #   @return [Boolean] Request reverse charge fields. (default: +false+)
+    preference :show_reverse_charge_fields, :boolean, default: false
+
     preference :search_fields, :hash, default: {
       "spree/admin/orders" => [
         {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.6.1
 platform: ruby
 authors:
 - Solidus Team
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: 4.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: 4.6.1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: 4.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: 4.6.1
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -857,7 +857,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.
 test_files: []