solidus_backend 3.1.3 → 3.1.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8d2ffe2f5b047902e746424ec130c9e47c26c0afe0819d5b65a5dd69271c932c
4
- data.tar.gz: e9e4c1eed9321da8beb1c903d417409eb7d8adefc71cc659f044ee011addc730
3
+ metadata.gz: 8dc01e3b01c3876e3d6f6ba3868989c62f93183e596b459ed0e5684ac9675b80
4
+ data.tar.gz: 5e331223ae29935f1faa971e3ed5576ce31e9f351e186132c9015fa6618c2457
5
5
  SHA512:
6
- metadata.gz: afe612336c190aee45444febca10597b456dcd323b6c0b95cf1180396d3c2c44444bb3b6691f0e235c70839ea8410f85e178980fcb1061671caa0e7b7cb6a64c
7
- data.tar.gz: 0bdc494c94e9040f0132bfdfa397624a6bac51cfe4adb7b148fef6e2a06b03f905621ac28dade04945674e74185ba3247589ea6e0c3cb4ccf55aaf3b3f21b6b0
6
+ metadata.gz: 7f94b557b15f599f621aa4a1258a605448b6470c4815757e2f816211921e32fe75f31e80b4d92ca5e67b51c9970e2170fb7f87399099de752b7d02179827da48
7
+ data.tar.gz: fb27ed84fc99b2070b856195f81622ff4c1c64bb70f9d8fc7b3bf018fb4ff717f12d6d9e9eb8c927a39b14fc5a7f45e428ac250ecd1f3847b53322692a2343a5
@@ -1,6 +1,14 @@
1
1
  //= require solidus_admin/Sortable
2
2
  /* eslint no-unused-vars: "off" */
3
3
 
4
+ /* Check if string is valid UUID */
5
+ function isAValidUUID(str) {
6
+ // https://stackoverflow.com/a/13653180/8170555
7
+ 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;
8
+
9
+ return regexExp.test(str);
10
+ }
11
+
4
12
  Spree.SortableTable = {
5
13
  refresh: function() {
6
14
  var sortable_tables = document.querySelectorAll('table.sortable');
@@ -16,7 +24,7 @@ Spree.SortableTable = {
16
24
  var idAttr = el.id;
17
25
  if (idAttr) {
18
26
  var objId = idAttr.split('_').slice(-1);
19
- if (!isNaN(objId)) {
27
+ if (!isNaN(objId) || isAValidUUID(objId)) {
20
28
  positions['positions['+objId+']'] = index + 1;
21
29
  }
22
30
  }
@@ -57,38 +57,6 @@ ul.text_list {
57
57
  padding-left: 0;
58
58
  }
59
59
 
60
- dl {
61
- width: 100%;
62
- overflow: hidden;
63
- margin: 5px 0;
64
- color: lighten($body-color, 15);
65
-
66
- dt, dd {
67
- float: left;
68
- line-height: 16px;
69
- padding: 5px;
70
- }
71
-
72
- dt {
73
- width: 40%;
74
- font-weight: $font-weight-bold;
75
- padding-left: 0;
76
- clear: left;
77
- }
78
-
79
- dd {
80
- width: 60%;
81
- padding-right: 0;
82
- margin-left: 0;
83
- }
84
- }
85
-
86
- .dl-collapse {
87
- dt, dd {
88
- width: auto;
89
- }
90
- }
91
-
92
60
  // Helpers
93
61
  .align-center { text-align: center }
94
62
  .align-right { text-align: right }
@@ -13,12 +13,12 @@
13
13
  <tr data-hook="adjustment_buttons">
14
14
  <td class="align-right" colspan="2" style="width: 50%">
15
15
  <% if can? :update, Spree::Adjustment %>
16
- <%= button_to t('spree.unfinalize_all_adjustments'), adjustments_unfinalize_admin_order_path(@order), method: :get %>
16
+ <%= button_to t('spree.unfinalize_all_adjustments'), adjustments_unfinalize_admin_order_path(@order), method: :put %>
17
17
  <% end %>
18
18
  </td>
19
19
  <td colspan="2" style="width: 50%">
20
20
  <% if can? :update, Spree::Adjustment %>
21
- <%= button_to t('spree.finalize_all_adjustments'), adjustments_finalize_admin_order_path(@order), method: :get %>
21
+ <%= button_to t('spree.finalize_all_adjustments'), adjustments_finalize_admin_order_path(@order), method: :put %>
22
22
  <% end %>
23
23
  </td>
24
24
  <td class='actions'>&nbsp;</td>
@@ -58,7 +58,7 @@
58
58
  <% allowed_actions = payment.actions.select { |a| can?(a.to_sym, payment) } %>
59
59
  <% allowed_actions.each do |action| %>
60
60
  <% if action == 'credit' %>
61
- <%= link_to_with_icon 'reply', t('spree.refund'), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
61
+ <%= link_to_with_icon 'mail-reply', t('spree.actions.refund'), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
62
62
  <% elsif action == 'capture' && !@order.completed? %>
63
63
  <%# no capture prior to completion. payments get captured when the order completes. %>
64
64
  <% else %>
@@ -10,14 +10,14 @@
10
10
  <div data-hook="admin_refund_form_fields" class="row">
11
11
  <div class="col-3">
12
12
  <div class="field">
13
- <%= t('spree.payment_amount') %><br/>
14
- <%= @refund.payment.amount %>
13
+ <label><%= t('spree.payment_amount') %></label><br>
14
+ <%= Spree::Money.new(@refund.payment.amount) %>
15
15
  </div>
16
16
  </div>
17
17
  <div class="col-3">
18
18
  <div class="field">
19
- <%= t('spree.credit_allowed') %><br/>
20
- <%= @refund.payment.credit_allowed %>
19
+ <label><%= t('spree.credit_allowed') %></label><br/>
20
+ <%= Spree::Money.new(@refund.payment.credit_allowed) %>
21
21
  </div>
22
22
  </div>
23
23
  <div class="col-3">
@@ -29,13 +29,13 @@
29
29
  <div class="col-3">
30
30
  <div class="field">
31
31
  <%= f.label :refund_reason_id %><br/>
32
- <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'custom-select fullwidth'}) %>
32
+ <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {prompt: t("spree.choose_reason")}, {class: 'custom-select fullwidth'}) %>
33
33
  </div>
34
34
  </div>
35
35
  </div>
36
36
 
37
37
  <div class="form-buttons filter-actions actions" data-hook="buttons">
38
- <%= f.submit Spree::Refund.model_name.human, class: 'btn btn-primary' %>
38
+ <%= f.submit t('spree.actions.refund'), class: 'btn btn-primary' %>
39
39
  <%= link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order), class: 'btn btn-primary' %>
40
40
  </div>
41
41
  </fieldset>
data/config/routes.rb CHANGED
@@ -77,8 +77,8 @@ Spree::Core::Engine.routes.draw do
77
77
  get :confirm
78
78
  put :complete
79
79
  post :resend
80
- get "/adjustments/unfinalize", to: "orders#unfinalize_adjustments"
81
- get "/adjustments/finalize", to: "orders#finalize_adjustments"
80
+ put "/adjustments/unfinalize", to: "orders#unfinalize_adjustments"
81
+ put "/adjustments/finalize", to: "orders#finalize_adjustments"
82
82
  put :approve
83
83
  put :cancel
84
84
  put :resume
@@ -91,7 +91,7 @@ Spree::Core::Engine.routes.draw do
91
91
  end
92
92
  end
93
93
 
94
- resources :adjustments
94
+ resources :adjustments, except: [:show]
95
95
  resources :return_authorizations do
96
96
  member do
97
97
  put :fire
@@ -5,3 +5,38 @@
5
5
  padding-left: 0;
6
6
  list-style: none;
7
7
  }
8
+
9
+ dl {
10
+ display: flex;
11
+ flex-wrap: wrap;
12
+ justify-content: space-between;
13
+ width: 100%;
14
+ overflow: hidden;
15
+ margin: 5px 0;
16
+ color: lighten($body-color, 15);
17
+
18
+ dt,
19
+ dd {
20
+ min-width: 40%;
21
+ line-height: 16px;
22
+ padding: 5px;
23
+ }
24
+
25
+ dt {
26
+ font-weight: $font-weight-bold;
27
+ padding-left: 0;
28
+ }
29
+
30
+ dd {
31
+ text-align: right;
32
+ padding-right: 0;
33
+ margin-left: 0;
34
+ }
35
+ }
36
+
37
+ .dl-collapse {
38
+ dt,
39
+ dd {
40
+ width: auto;
41
+ }
42
+ }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.3
4
+ version: 3.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-11-17 00:00:00.000000000 Z
11
+ date: 2022-06-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.1.3
19
+ version: 3.1.6
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.1.3
26
+ version: 3.1.6
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: solidus_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.1.3
33
+ version: 3.1.6
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.1.3
40
+ version: 3.1.6
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: coffee-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -920,7 +920,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
920
920
  - !ruby/object:Gem::Version
921
921
  version: 1.8.23
922
922
  requirements: []
923
- rubygems_version: 3.1.2
923
+ rubygems_version: 3.2.31
924
924
  signing_key:
925
925
  specification_version: 4
926
926
  summary: Admin interface for the Solidus e-commerce framework.