solidus_backend 2.11.14 → 2.11.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83fcc31040b9f0ec7cf12ce39ca5d24fb360345c3b41b88bbd56b281496e4144
-  data.tar.gz: 475c5d22811acce68aae2cf8a925b82fa072739461f856e9b43f6e13d5b7c88b
+  metadata.gz: aac00b927565875614437f63f0e5ab707b7722c96988d83ddd01c306aee9b448
+  data.tar.gz: 0a18d3f2fa77aa217f71602cebe0529b0eedeb21ad56d7cf447c09f1d88c2d67
 SHA512:
-  metadata.gz: cfeef1364e896136116e97d2a4bcd06f03beac6e03c3090b0f32a2dbbb744211da97869dc4f01972ac83bb7463f6ec7fe2bff6b6693d1d64da396b0de87ea751
-  data.tar.gz: 65667216b30e850f439b2d4dcfef225064b851fa4da1347b9962da3b39e830cf7860687797d30c70f7899bfe6dfc5059e59674e71f597e4359dbf217194763eb
+  metadata.gz: 3c1e390834e5d121f1c93c79581bbcd646eb3bf299ecfa91097772a56bd4607223416640d238c84de12d184846c5c54642c086b067c4a9c4dbde3e6bf33eabee
+  data.tar.gz: d29956ffb3501f2b0adaa70b94ca5fd0408d217f1ae0eed79592fb1f555d30bbdf078c1a053041a4268f47fcb02e18865d68c9d711b940e5ab72b4c3b17660af

data/app/assets/javascripts/spree/backend/components/sortable_table.js

@@ -1,6 +1,14 @@
 //= require solidus_admin/Sortable
 /* eslint no-unused-vars: "off" */
 
+/* Check if string is valid UUID */
+function isAValidUUID(str) {
+  // https://stackoverflow.com/a/13653180/8170555
+  const regexExp = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+
+  return regexExp.test(str);
+}
+
 Spree.SortableTable = {
   refresh: function() {
     var sortable_tables = document.querySelectorAll('table.sortable');
@@ -16,7 +24,7 @@ Spree.SortableTable = {
             var idAttr = el.id;
             if (idAttr) {
               var objId = idAttr.split('_').slice(-1);
-              if (!isNaN(objId)) {
+              if (!isNaN(objId) || isAValidUUID(objId)) {
                 positions['positions['+objId+']'] = index + 1;
               }
             }

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

@@ -1,5 +1,5 @@
 Spree.Views.Order.Address = Backbone.View.extend({
-  initialize: function(options) {
+  initialize: function() {
     // read initial values from page
     this.onChange();
 
@@ -23,8 +23,9 @@ 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"];
+    var fields = ["name", "firstname", "lastname", "company", "address1",
+                  "address2", "city", "zipcode", "phone", "country_id",
+                  "state_name"];
     _.each(fields, function(field) {
       var el = view.$('[name$="[' + field + ']"]');
       if (el.length) callback(field, el);

data/app/assets/stylesheets/spree/backend/shared/_typography.scss

@@ -57,38 +57,6 @@ ul.text_list {
   padding-left: 0;
 }
 
-dl {
-  width: 100%;
-  overflow: hidden;
-  margin: 5px 0;
-  color: lighten($body-color, 15);
-
-  dt, dd {
-    float: left;
-    line-height: 16px;
-    padding: 5px;
-  }
-
-  dt {
-    width: 40%;
-    font-weight: $font-weight-bold;
-    padding-left: 0;
-    clear: left;
-  }
-
-  dd {
-    width: 60%;
-    padding-right: 0;
-    margin-left: 0;
-  }
-}
-
-.dl-collapse {
-  dt, dd {
-    width: auto;
-  }
-}
-
 // Helpers
 .align-center  { text-align: center  }
 .align-right   { text-align: right   }

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

@@ -126,7 +126,7 @@ module Spree
 
         @search = super.ransack(params[:q])
         @collection = @search.result.includes(:spree_roles)
-        @collection = @collection.includes(:spree_orders)
+        @collection = @collection.includes(:orders)
         @collection = @collection.page(params[:page]).per(Spree::Config[:admin_products_per_page])
       end
 
@@ -155,7 +155,7 @@ module Spree
       # handling raise from Spree::Admin::ResourceController#destroy
       def user_destroy_with_orders_error
         invoke_callbacks(:destroy, :fails)
-        render status: :forbidden, text: t('spree.error_user_destroy_with_orders')
+        render status: :forbidden, plain: t("spree.error_user_destroy_with_orders")
       end
 
       def sign_in_if_change_own_password

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -13,12 +13,12 @@
     <tr data-hook="adjustment_buttons">
       <td class="align-right" colspan="2" style="width: 50%">
         <% if can? :update, Spree::Adjustment %>
-          <%= button_to t('spree.unfinalize_all_adjustments'), adjustments_unfinalize_admin_order_path(@order), method: :get %>
+          <%= button_to t('spree.unfinalize_all_adjustments'), adjustments_unfinalize_admin_order_path(@order), method: :put %>
         <% end %>
       </td>
       <td colspan="2" style="width: 50%">
         <% if can? :update, Spree::Adjustment %>
-          <%= button_to t('spree.finalize_all_adjustments'), adjustments_finalize_admin_order_path(@order), method: :get %>
+          <%= button_to t('spree.finalize_all_adjustments'), adjustments_finalize_admin_order_path(@order), method: :put %>
         <% end %>
       </td>
       <td class='actions'>&nbsp;</td>

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

@@ -58,7 +58,7 @@
             <% allowed_actions = payment.actions.select { |a| can?(a.to_sym, payment) } %>
             <% allowed_actions.each do |action| %>
               <% if action == 'credit' %>
-                <%= link_to_with_icon 'reply', t('spree.refund'), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
+                <%= 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. %>
               <% else %>

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

@@ -10,14 +10,14 @@
     <div data-hook="admin_refund_form_fields" class="row">
       <div class="col-3">
         <div class="field">
-          <%= t('spree.payment_amount') %><br/>
-          <%= @refund.payment.amount %>
+          <label><%= t('spree.payment_amount') %></label><br>
+          <%= Spree::Money.new(@refund.payment.amount) %>
         </div>
       </div>
       <div class="col-3">
         <div class="field">
-          <%= t('spree.credit_allowed') %><br/>
-          <%= @refund.payment.credit_allowed %>
+          <label><%= t('spree.credit_allowed') %></label><br/>
+          <%= Spree::Money.new(@refund.payment.credit_allowed) %>
         </div>
       </div>
       <div class="col-3">
@@ -29,13 +29,13 @@
       <div class="col-3">
         <div class="field">
           <%= f.label :refund_reason_id %><br/>
-          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'custom-select fullwidth'}) %>
+          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {prompt: t("spree.choose_reason")}, {class: 'custom-select fullwidth'}) %>
         </div>
       </div>
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= f.submit Spree::Refund.model_name.human, class: 'btn btn-primary' %>
+      <%= f.submit t('spree.actions.refund'), class: 'btn btn-primary' %>
       <%= link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order), class: 'btn btn-primary' %>
     </div>
   </fieldset>

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

@@ -40,6 +40,7 @@
         <%= label_tag nil, plural_resource_name(Spree::StockLocation) %>
         <ul>
           <% if can?(:manage, Spree::UserStockLocation) %>
+            <%= hidden_field_tag('user[stock_location_ids][]', nil) %>
             <% @stock_locations.each do |stock_location| %>
               <li>
                 <label>

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

@@ -89,7 +89,7 @@
           <% if can?(:edit, user) %>
             <%= link_to_edit user, no_text: true %>
           <% end %>
-          <% if can?(:destroy, user) && user.orders.count.zero? %>
+          <% if can?(:destroy, user) && user.orders.none? %>
             <%= link_to_delete user, no_text: true %>
           <% end %>
         </td>

data/config/routes.rb

@@ -77,8 +77,8 @@ Spree::Core::Engine.routes.draw do
         get :confirm
         put :complete
         post :resend
-        get "/adjustments/unfinalize", to: "orders#unfinalize_adjustments"
-        get "/adjustments/finalize", to: "orders#finalize_adjustments"
+        put "/adjustments/unfinalize", to: "orders#unfinalize_adjustments"
+        put "/adjustments/finalize", to: "orders#finalize_adjustments"
         put :approve
         put :cancel
         put :resume
@@ -91,7 +91,7 @@ Spree::Core::Engine.routes.draw do
         end
       end
 
-      resources :adjustments
+      resources :adjustments, except: [:show]
       resources :return_authorizations do
         member do
           put :fire

data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_lists.scss

@@ -5,3 +5,38 @@
   padding-left: 0;
   list-style: none;
 }
+
+dl {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  width: 100%;
+  overflow: hidden;
+  margin: 5px 0;
+  color: lighten($body-color, 15);
+
+  dt,
+  dd {
+    min-width: 40%;
+    line-height: 16px;
+    padding: 5px;
+  }
+
+  dt {
+    font-weight: $font-weight-bold;
+    padding-left: 0;
+  }
+
+  dd {
+    text-align: right;
+    padding-right: 0;
+    margin-left: 0;
+  }
+}
+
+.dl-collapse {
+  dt,
+  dd {
+    width: auto;
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.11.14
+  version: 2.11.17
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.14
+        version: 2.11.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.14
+        version: 2.11.17
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.14
+        version: 2.11.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.14
+        version: 2.11.17
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement