solidus_backend 4.1.5 → 4.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +0 -1
  3. data/app/assets/config/solidus_backend_manifest.js +2 -1
  4. data/app/assets/images/spree/backend/themes/solidus_admin/remixicon.symbol.svg +11 -0
  5. data/app/assets/javascripts/spree/backend/components/admin_nav.js +18 -0
  6. data/app/assets/javascripts/spree/backend/option_value_picker.js +0 -1
  7. data/app/assets/javascripts/spree/backend/views/promotions/option_values_rule.js +3 -3
  8. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +11 -0
  9. data/app/assets/stylesheets/spree/backend/components/_navigation_solidus_admin.scss +274 -0
  10. data/app/assets/stylesheets/spree/backend/components/_switch_solidus_admin.scss +48 -0
  11. data/app/assets/stylesheets/spree/backend/shared/_layout.scss +1 -1
  12. data/app/assets/stylesheets/spree/backend/themes/solidus_admin/_colors.scss +44 -0
  13. data/app/assets/stylesheets/spree/backend/themes/solidus_admin/_tables.scss +8 -8
  14. data/app/assets/stylesheets/spree/backend/themes/solidus_admin/_variables.scss +28 -72
  15. data/app/controllers/spree/admin/payment_methods_controller.rb +1 -1
  16. data/app/controllers/spree/admin/products_controller.rb +2 -2
  17. data/app/controllers/spree/admin/resource_controller.rb +13 -9
  18. data/app/controllers/spree/admin/stock_items_controller.rb +22 -13
  19. data/app/helpers/spree/admin/navigation_helper.rb +46 -29
  20. data/app/views/spree/admin/shared/_navigation_solidus_admin.html.erb +101 -0
  21. data/app/views/spree/admin/shared/_product_sub_menu.html.erb +7 -5
  22. data/app/views/spree/admin/shared/_promotion_sub_menu.html.erb +4 -2
  23. data/app/views/spree/admin/shared/_settings_sub_menu.html.erb +8 -6
  24. data/app/views/spree/admin/shared/_tabs.html.erb +18 -6
  25. data/app/views/spree/admin/shared/_variant_search.html.erb +8 -1
  26. data/app/views/spree/admin/stock_items/_stock_management.html.erb +21 -9
  27. data/app/views/spree/admin/stock_items/index.html.erb +4 -1
  28. data/app/views/spree/layouts/admin.html.erb +6 -2
  29. data/lib/spree/backend_configuration/deprecated_tab_constants.rb +34 -0
  30. data/lib/spree/backend_configuration/menu_item.rb +67 -13
  31. data/lib/spree/backend_configuration.rb +131 -58
  32. data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es-CL.js +10 -0
  33. data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_hy.js +37 -0
  34. metadata +15 -7
@@ -21,4 +21,22 @@ Spree.ready(function() {
21
21
  if (document.body.classList.contains('admin-nav-hidden')) {
22
22
  $(adminNavToggle).removeClass('fa-chevron-circle-left').addClass('fa-chevron-circle-right');
23
23
  }
24
+
25
+ let solidusAdminSwitch = document.querySelector("#solidus-admin-switch");
26
+
27
+ if (solidusAdminSwitch) {
28
+ let cookies = new Map(document.cookie.split(';').map((cookie) => cookie.trim().split('=')))
29
+ let label = document.querySelector("#solidus-admin-switch-label");
30
+
31
+ solidusAdminSwitch.checked = cookies.get("solidus_admin") === 'false'
32
+ label.textContent = solidusAdminSwitch.checked ? label.dataset.adminLabel : label.dataset.legacyLabel
33
+
34
+ solidusAdminSwitch.addEventListener("change", function(e) {
35
+ let value = !solidusAdminSwitch.checked;
36
+
37
+ document.cookie = `solidus_admin=${value}; Path=/ `;
38
+
39
+ location.reload();
40
+ });
41
+ }
24
42
  });
@@ -25,7 +25,6 @@ $.fn.optionValueAutocomplete = function (options) {
25
25
  url: Spree.pathFor('api/option_values'),
26
26
  datatype: 'json',
27
27
  data: function (term, page) {
28
- // Note: This doesn't work. variants_product_id isn't an allowed filter
29
28
  var productId = typeof(productSelect) !== 'undefined' ? $(productSelect).select2('val') : null;
30
29
  return {
31
30
  q: {
@@ -23,9 +23,9 @@ Spree.Views.Promotions.OptionValuesRuleRow = Backbone.View.extend({
23
23
 
24
24
  this.$('.js-promo-rule-option-value-product-select').productAutocomplete({multiple: false});
25
25
 
26
- // Note: This doesn't work. This always selects the first product select on the page.
27
- // optionValueAutocomplete also doesn't work, so this cancels out.
28
- this.$('.js-promo-rule-option-value-option-values-select').optionValueAutocomplete({productSelect: '.js-promo-rule-option-value-product-select'})
26
+ var productSelect = this.$el.find(".js-promo-rule-option-value-product-select")
27
+
28
+ this.$('.js-promo-rule-option-value-option-values-select').optionValueAutocomplete({ productSelect })
29
29
 
30
30
  if(this.productId == null) {
31
31
  this.$('.js-promo-rule-option-value-option-values-select').prop('disabled', true);
@@ -1,3 +1,5 @@
1
+ @import "./navigation_solidus_admin";
2
+
1
3
  $padding-x-navbar: 26px;
2
4
  $padding-y-navbar: 13px;
3
5
  $padding-y-navbar-submenu: 9px;
@@ -188,6 +190,15 @@ nav.menu {
188
190
  left: 1em;
189
191
  transform: translateX(-50%);
190
192
  }
193
+
194
+ svg {
195
+ position: absolute;
196
+ margin-left: -2.2em;
197
+ fill: currentColor;
198
+ height: 1.4em;
199
+ width: 1.4em;
200
+ vertical-align: -0.3em;
201
+ }
191
202
  }
192
203
 
193
204
  // until .fa usage is corrected
@@ -0,0 +1,274 @@
1
+ $color-navbar-hover-bg: $color-navbar-bg !default;
2
+ $color-navbar-hover: $color-navbar !default;
3
+ @import "spree/backend/themes/solidus_admin/colors";
4
+ @import "spree/backend/components/switch_solidus_admin";
5
+
6
+ .solidus-admin--nav {
7
+ background-color: $color-light;
8
+ position: sticky;
9
+ top: 0;
10
+ bottom: 0;
11
+ left: 0;
12
+ margin-left: -$width-sidebar;
13
+ z-index: $zindex-sticky;
14
+ width: $width-sidebar;
15
+ padding: 16px;
16
+ box-sizing: border-box;
17
+ display: flex;
18
+ flex-direction: column;
19
+ min-height: 100vh;
20
+ border-right: $color-light-accent 1px solid;
21
+
22
+ &--wrapper {
23
+ position: absolute;
24
+ top: 0;
25
+ bottom: 0;
26
+ left: 0;
27
+ width: 240px;
28
+ }
29
+
30
+ @media print {
31
+ display: none;
32
+ }
33
+
34
+ &--section {
35
+ text-align: center;
36
+ width: 100%;
37
+ flex-grow: 0;
38
+ flex-shrink: 0;
39
+
40
+ &:not(:last-child) {
41
+ margin-bottom: 16px;
42
+ }
43
+ }
44
+
45
+ > nav {
46
+ flex-grow: 1;
47
+ }
48
+
49
+ &--logo {
50
+ display: flex;
51
+ align-items: center;
52
+ overflow: hidden;
53
+ text-align: left;
54
+ margin-bottom: 16px;
55
+ padding: 12px 8px;
56
+
57
+ img {
58
+ max-height: $main-header-height - (16px * 2) - (12px * 2);
59
+ }
60
+ }
61
+
62
+ &--store-link {
63
+ display: flex;
64
+ width: 100%;
65
+ border: $border-color 1px solid;
66
+ border-radius: $border-radius;
67
+ padding: 6px 8px;
68
+ text-align: left;
69
+
70
+ &:hover {
71
+ background: $color-navbar-hover-bg;
72
+ color: $color-navbar-hover;
73
+ }
74
+
75
+ i {
76
+ float: right;
77
+ padding: 6px 8px;
78
+ color: $color-dark-light;
79
+ }
80
+
81
+ &--name {
82
+ line-height: 24px;
83
+ font-size: 14px;
84
+ font-weight: 600;
85
+ color: $color-dark;
86
+ display: block;
87
+ }
88
+
89
+ &--url {
90
+ line-height: 20px;
91
+ font-size: 12px;
92
+ font-weight: 400;
93
+ color: $color-dark-light;
94
+ display: block;
95
+ }
96
+
97
+ svg {
98
+ fill: $solidus-admin-gray-400;
99
+ height: 16px;
100
+ width: 100%;
101
+ max-width: 16px;
102
+ }
103
+ }
104
+
105
+ &--menu {
106
+ padding: 0;
107
+ list-style: none;
108
+ text-align: left;
109
+
110
+ li {
111
+ padding: 0;
112
+ }
113
+
114
+ li > a,
115
+ li > label {
116
+ margin: 0;
117
+ margin-bottom: 2px;
118
+ display: block;
119
+ font-size: 14px;
120
+ line-height: 24px;
121
+ font-weight: 600;
122
+ padding: 2px 12px;
123
+ width: 100%;
124
+ border-radius: $border-radius;
125
+ color: $color-primary;
126
+ gap: 12px;
127
+ display: flex;
128
+ align-items: center;
129
+
130
+ &::before,
131
+ svg {
132
+ display: inline-block;
133
+ width: 18px;
134
+ height: 18px;
135
+ padding: 0;
136
+ }
137
+ }
138
+
139
+ li.selected > a {
140
+ background: $color-navbar-active-bg;
141
+ color: $color-navbar-active;
142
+ }
143
+
144
+ li:not(.selected):hover > a,
145
+ li:not(.selected):hover > label {
146
+ background: $color-navbar-hover-bg;
147
+ color: $color-navbar-hover;
148
+ }
149
+
150
+ ul {
151
+ padding: 0;
152
+ margin: 0;
153
+ list-style: none;
154
+
155
+ li a {
156
+ padding-left: 12px + 18px + 12px;
157
+ font-weight: 400;
158
+ color: $color-dark-dark;
159
+ }
160
+ }
161
+
162
+ li:not(.selected) > ul {
163
+ display: none;
164
+ }
165
+ }
166
+
167
+ &--footer {
168
+ position: relative;
169
+ width: 100%;
170
+
171
+ summary {
172
+ display: flex;
173
+ padding: 12px;
174
+ margin-top: 8px;
175
+ gap: 6px;
176
+ border-radius: 4px;
177
+ color: $solidus-admin-gray-500;
178
+ cursor: pointer;
179
+ line-height: 0;
180
+ align-items: center;
181
+ font-size: 14px;
182
+ font-weight: 600;
183
+ outline: none;
184
+
185
+ &:hover {
186
+ background-color: $solidus-admin-gray-25;
187
+ }
188
+
189
+ [open] > & {
190
+ background-color: $solidus-admin-gray-25;
191
+ }
192
+
193
+ &::marker,
194
+ &::-webkit-details-marker {
195
+ display: none;
196
+ }
197
+
198
+ svg {
199
+ display: inline-block;
200
+ flex-shrink: 0;
201
+ vertical-align: text-bottom;
202
+ width: 24px;
203
+ height: 24px;
204
+ background-color: $solidus-admin-black;
205
+ fill: $solidus-admin-yellow;
206
+ border-radius: 100%;
207
+ }
208
+
209
+ div {
210
+ line-height: 24px;
211
+ align-self: stretch;
212
+ overflow: hidden;
213
+ text-overflow: ellipsis;
214
+ white-space: nowrap;
215
+ }
216
+ }
217
+
218
+ ul {
219
+ font-size: 14px;
220
+ position: absolute;
221
+ left: 0;
222
+ bottom: 100%;
223
+ padding: 8px;
224
+ margin-bottom: 4px;
225
+ border-radius: 8px;
226
+ border: 1px $solidus-admin-gray-100 solid;
227
+ width: 100%;
228
+ color: $solidus-admin-black;
229
+ background-color: $solidus-admin-white;
230
+ box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px,
231
+ rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.08) 0px 4px 8px 0px,
232
+ rgba(0, 0, 0, 0.04) 0px 2px 4px -1px;
233
+
234
+ li {
235
+ display: flex;
236
+ align-items: center;
237
+ border-radius: 4px;
238
+ height: 32px;
239
+ padding: 0 8px;
240
+
241
+ &:hover {
242
+ background-color: $solidus-admin-gray-25;
243
+ }
244
+
245
+ a,
246
+ label {
247
+ display: flex;
248
+ align-items: center;
249
+ gap: 8px;
250
+ color: inherit;
251
+ height: 32px;
252
+ margin: 0px;
253
+ font-size: 1em;
254
+ background-color: inherit;
255
+
256
+ select {
257
+ appearance: none;
258
+ border: none;
259
+ background-color: transparent;
260
+ width: 100%;
261
+ flex-grow: 1;
262
+ }
263
+
264
+ svg {
265
+ height: 20px;
266
+ width: 100%;
267
+ max-width: 20px;
268
+ fill: currentColor;
269
+ }
270
+ }
271
+ }
272
+ }
273
+ }
274
+ }
@@ -0,0 +1,48 @@
1
+ @import "spree/backend/themes/solidus_admin/colors";
2
+
3
+ .solidus-admin--nav--switch {
4
+ appearance: none;
5
+ cursor: pointer;
6
+ width: 2.5rem;
7
+ height: 1.5rem;
8
+ background: $solidus-admin-gray-200;
9
+ display: block;
10
+ border-radius: 100px;
11
+ position: relative;
12
+
13
+ &:focus {
14
+ outline: 0;
15
+ }
16
+
17
+ &:hover {
18
+ background-color: $solidus-admin-gray-300;
19
+ }
20
+
21
+ &:after {
22
+ content: '';
23
+ position: absolute;
24
+ top: 0.125rem;
25
+ left: 0.125rem;
26
+ width: 1.25rem;
27
+ height: 1.25rem;
28
+ background: #fff;
29
+ border-radius: 90px;
30
+ transition: 0.3s;
31
+ }
32
+
33
+ &:checked {
34
+ background: $solidus-admin-gray-500;
35
+ &:after {
36
+ left: 2.375rem;
37
+ transform: translatex(-100%);
38
+ }
39
+
40
+ &:hover {
41
+ background: $solidus-admin-gray-700;
42
+ }
43
+ }
44
+
45
+ &:active:after {
46
+ width: 1.5rem;
47
+ }
48
+ }
@@ -4,7 +4,7 @@ html {
4
4
 
5
5
  body {
6
6
  position: relative;
7
- min-height: 100%;
7
+ min-height: 100vh;
8
8
  padding-left: $width-sidebar;
9
9
  }
10
10
 
@@ -0,0 +1,44 @@
1
+ // Primary palette
2
+ $solidus-admin-solidus-red: #ef3023;
3
+ $solidus-admin-black: #222222;
4
+ $solidus-admin-graphite: #c7ccc7;
5
+ $solidus-admin-graphite-light: #d8dad8;
6
+ $solidus-admin-sand: #f5f3f0;
7
+ $solidus-admin-white: #ffffff;
8
+
9
+ // Secondary palette
10
+ $solidus-admin-yellow: #fdc071;
11
+ $solidus-admin-orange: #f68050;
12
+ $solidus-admin-blue: #2554b1;
13
+ $solidus-admin-moss: #2d3925;
14
+ $solidus-admin-forest: #096756;
15
+ $solidus-admin-midnight: #163449;
16
+ $solidus-admin-pink: #f6d7e2;
17
+ $solidus-admin-plum: #3a0e31;
18
+ $solidus-admin-sky: #cbdff1;
19
+ $solidus-admin-seafoam: #c1e0de;
20
+ $solidus-admin-dune: #e6bf9b;
21
+
22
+ // UI Red
23
+ $solidus-admin-red-100: #f8d6d3;
24
+ $solidus-admin-red-200: #f1ada7;
25
+ $solidus-admin-red-300: #ea8980;
26
+ $solidus-admin-red-400: #e36054;
27
+ $solidus-admin-red-500: #dc3728;
28
+ $solidus-admin-red-600: #b12c20;
29
+ $solidus-admin-red-700: #862219;
30
+ $solidus-admin-red-800: #561610;
31
+ $solidus-admin-red-900: #2b0b08;
32
+
33
+ // Grayscale
34
+ $solidus-admin-gray-15: #fafafa;
35
+ $solidus-admin-gray-25: #f5f5f5;
36
+ $solidus-admin-gray-50: #f0f0f0;
37
+ $solidus-admin-gray-100: #dedede;
38
+ $solidus-admin-gray-200: #cfcfcf;
39
+ $solidus-admin-gray-300: #bababa;
40
+ $solidus-admin-gray-400: #a3a3a3;
41
+ $solidus-admin-gray-500: #737373;
42
+ $solidus-admin-gray-600: #616161;
43
+ $solidus-admin-gray-700: #4a4a4a;
44
+ $solidus-admin-gray-800: #333333;
@@ -20,34 +20,34 @@ table.index {
20
20
  }
21
21
 
22
22
  > thead > tr > th {
23
- border-top: 1px solid $theme-gray-100;
23
+ border-top: 1px solid $solidus-admin-gray-100;
24
24
  border-bottom: none
25
25
  }
26
26
 
27
27
  > thead > tr > th,
28
28
  > tbody > tr > td {
29
29
  &:first-child {
30
- border-left: 1px solid $theme-gray-100;
30
+ border-left: 1px solid $solidus-admin-gray-100;
31
31
  }
32
32
 
33
33
  &:last-child {
34
- border-right: 1px solid $theme-gray-100;
34
+ border-right: 1px solid $solidus-admin-gray-100;
35
35
  }
36
36
  }
37
37
 
38
38
  > tbody > tr:last-child > td {
39
- border-bottom: 1px solid $theme-gray-100;
39
+ border-bottom: 1px solid $solidus-admin-gray-100;
40
40
  }
41
41
 
42
42
  // Colors
43
43
  > th {
44
- background-color: $theme-gray-15;
45
- color: $theme-gray-600;
44
+ background-color: $solidus-admin-gray-15;
45
+ color: $solidus-admin-gray-600;
46
46
  }
47
47
 
48
48
  > td {
49
- background-color: $theme-white;
50
- color: $theme-black;
49
+ background-color: $solidus-admin-white;
50
+ color: $solidus-admin-black;
51
51
  }
52
52
  }
53
53
 
@@ -1,3 +1,4 @@
1
+ @import "./colors";
1
2
 
2
3
  // -------------------------------------------------------------
3
4
  // Variables used in all other files
@@ -11,70 +12,25 @@ $label-font-size: 12px;
11
12
  // Colors
12
13
  //--------------------------------------------------------------
13
14
 
14
- // Primary palette
15
- $theme-solidus-red: #ef3023;
16
- $theme-black: #222222;
17
- $theme-graphite: #c7ccc7;
18
- $theme-graphite-light: #d8dad8;
19
- $theme-sand: #f5f3f0;
20
- $theme-white: #ffffff;
21
-
22
- // Secondary palette
23
- $theme-yellow: #fdc071;
24
- $theme-orange: #f68050;
25
- $theme-blue: #2554b1;
26
- $theme-moss: #2d3925;
27
- $theme-forest: #096756;
28
- $theme-midnight: #163449;
29
- $theme-pink: #f6d7e2;
30
- $theme-plum: #3a0e31;
31
- $theme-sky: #cbdff1;
32
- $theme-seafoam: #c1e0de;
33
- $theme-dune: #e6bf9b;
34
-
35
- // UI Red
36
- $theme-red-100: #f8d6d3;
37
- $theme-red-200: #f1ada7;
38
- $theme-red-300: #ea8980;
39
- $theme-red-400: #e36054;
40
- $theme-red-500: #dc3728;
41
- $theme-red-600: #b12c20;
42
- $theme-red-700: #862219;
43
- $theme-red-800: #561610;
44
- $theme-red-900: #2b0b08;
45
-
46
- // Grayscale
47
- $theme-gray-15: #fafafa;
48
- $theme-gray-25: #f5f5f5;
49
- $theme-gray-50: #f0f0f0;
50
- $theme-gray-100: #dedede;
51
- $theme-gray-200: #cfcfcf;
52
- $theme-gray-300: #bababa;
53
- $theme-gray-400: #a3a3a3;
54
- $theme-gray-500: #737373;
55
- $theme-gray-600: #616161;
56
- $theme-gray-700: #4a4a4a;
57
- $theme-gray-800: #333333;
58
-
59
15
  // Basic color palette for admin
60
16
 
61
- $color-dark: $theme-gray-800;
62
- $color-dark-dark: $theme-gray-600;
63
- $color-dark-light: $theme-gray-500;
64
- $color-dark-accent: $theme-gray-200;
17
+ $color-dark: $solidus-admin-gray-800;
18
+ $color-dark-dark: $solidus-admin-gray-600;
19
+ $color-dark-light: $solidus-admin-gray-500;
20
+ $color-dark-accent: $solidus-admin-gray-200;
65
21
 
66
- $color-primary: $theme-black;
67
- $color-primary-light: $theme-gray-100;
22
+ $color-primary: $solidus-admin-black;
23
+ $color-primary-light: $solidus-admin-gray-100;
68
24
 
69
- $color-light: $theme-gray-15;
70
- $color-light-dark: $theme-gray-50;
71
- $color-light-accent: $theme-gray-100;
25
+ $color-light: $solidus-admin-gray-15;
26
+ $color-light-dark: $solidus-admin-gray-50;
27
+ $color-light-accent: $solidus-admin-gray-100;
72
28
 
73
- $color-white: $theme-white;
29
+ $color-white: $solidus-admin-white;
74
30
 
75
- $color-red: $theme-red-600;
76
- $color-yellow: $theme-yellow;
77
- $color-green: $theme-forest;
31
+ $color-red: $solidus-admin-red-600;
32
+ $color-yellow: $solidus-admin-yellow;
33
+ $color-green: $solidus-admin-forest;
78
34
 
79
35
  // Basic accents for admin
80
36
  $box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.12);
@@ -84,13 +40,13 @@ $color-border: $color-light-dark;
84
40
  $color-disabled: $color-dark-light;
85
41
 
86
42
  // Basic navigation colors
87
- $color-header-bg: $theme-white;
43
+ $color-header-bg: $solidus-admin-white;
88
44
  $color-sidebar-bg: $color-light;
89
45
  $color-sidebar-border: $color-border;
90
46
  $color-navbar: $color-dark;
91
47
  $color-navbar-bg: $color-light;
92
- $color-navbar-active: $theme-solidus-red;
93
- $color-navbar-active-bg: $theme-gray-25;
48
+ $color-navbar-active: $solidus-admin-solidus-red;
49
+ $color-navbar-active-bg: $solidus-admin-gray-50;
94
50
  $color-navbar-submenu: $color-dark-light;
95
51
  $color-navbar-submenu-bg: $color-light;
96
52
  $color-navbar-submenu-active: $color-primary;
@@ -99,7 +55,7 @@ $color-navbar-footer-bg: $color-light;
99
55
  $color-navbar-footer-active: $color-primary;
100
56
  $color-icon-navbar: $color-dark-light;
101
57
 
102
- $color-navbar-hover-bg: $theme-gray-25;
58
+ $color-navbar-hover-bg: $solidus-admin-gray-50;
103
59
  $color-navbar-hover: $color-dark;
104
60
 
105
61
  // Basic Tabs colors
@@ -131,7 +87,7 @@ $color-style-guide-nav-link: darken($color-light, 65%);
131
87
  $color-style-guide-nav-link-hover: darken($color-light, 5%);
132
88
  $color-style-guide-section-border: darken($color-light, 10%);
133
89
  $color-style-guide-swatch-border: darken($color-light, 10%);
134
- $color-style-guide-table-border: $theme-sky;
90
+ $color-style-guide-table-border: $solidus-admin-sky;
135
91
 
136
92
  // Table colors
137
93
  $color-tbl-odd: $color-white;
@@ -143,20 +99,20 @@ $color-tbl-thead: $color-light;
143
99
  // For now these are custom assigned colors just for this section. As we go
144
100
  // about updating other areas of the admin we will likely want to pull these
145
101
  // colors out into better named variables.
146
- $color-pill-text: $theme-gray-800;
147
- $color-pill-neutral: $theme-gray-100;
102
+ $color-pill-text: $solidus-admin-gray-800;
103
+ $color-pill-neutral: $solidus-admin-gray-100;
148
104
  $color-pill-neutral-text: $color-pill-text;
149
- $color-pill-complete: $theme-sky;
105
+ $color-pill-complete: $solidus-admin-sky;
150
106
  $color-pill-complete-text: $color-pill-text;
151
- $color-pill-active: $theme-seafoam;
107
+ $color-pill-active: $solidus-admin-seafoam;
152
108
  $color-pill-active-text: $color-pill-text;
153
109
  $color-pill-inactive: $color-pill-neutral;
154
- $color-pill-inactive-text: $theme-gray-600;
155
- $color-pill-pending: $theme-yellow;
110
+ $color-pill-inactive-text: $solidus-admin-gray-600;
111
+ $color-pill-pending: $solidus-admin-yellow;
156
112
  $color-pill-pending-text: $color-pill-text;
157
- $color-pill-warning: $theme-orange;
113
+ $color-pill-warning: $solidus-admin-orange;
158
114
  $color-pill-warning-text: $color-pill-text;
159
- $color-pill-error: $theme-red-300;
115
+ $color-pill-error: $solidus-admin-red-300;
160
116
  $color-pill-error-text: $color-pill-text;
161
117
 
162
118
  // Available states
@@ -201,4 +157,4 @@ $main-header-height: 84px;
201
157
  $content-wrapper-bg: $color-white;
202
158
  $admin-body-bg: $color-white;
203
159
 
204
- $link-hover-color: $theme-solidus-red;
160
+ $link-hover-color: $solidus-admin-solidus-red;
@@ -28,7 +28,7 @@ module Spree
28
28
  invoke_callbacks(:update, :before)
29
29
 
30
30
  attributes = payment_method_params
31
- attributes.each_key do |key|
31
+ attributes.each do |key, _value|
32
32
  if key.include?("password") && attributes[key].blank?
33
33
  attributes.delete(key)
34
34
  end
@@ -68,7 +68,7 @@ module Spree
68
68
  if updating_variant_property_rules?
69
69
  url_params = {}
70
70
  url_params[:ovi] = []
71
- params[:product][:variant_property_rules_attributes].each_value do |param_attrs|
71
+ params[:product][:variant_property_rules_attributes].each do |_index, param_attrs|
72
72
  url_params[:ovi] += param_attrs[:option_value_ids]
73
73
  end
74
74
  spree.admin_product_product_properties_url(@product, url_params)
@@ -133,7 +133,7 @@ module Spree
133
133
  def normalize_variant_property_rules
134
134
  return unless updating_variant_property_rules?
135
135
 
136
- params[:product][:variant_property_rules_attributes].each_value do |param_attrs|
136
+ params[:product][:variant_property_rules_attributes].each do |_index, param_attrs|
137
137
  param_attrs[:option_value_ids] = param_attrs[:option_value_ids].split(',')
138
138
  end
139
139
  end