spree_backend 4.1.0.rc3 → 4.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/admin/return_authorizations_controller.rb +3 -3
  3. data/app/views/spree/admin/images/edit.html.erb +1 -1
  4. data/app/views/spree/admin/images/index.html.erb +1 -1
  5. data/app/views/spree/admin/return_authorizations/edit.html.erb +1 -1
  6. data/config/routes.rb +1 -1
  7. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6631595b25293998d780a5cf5820a4711f26662ea133b5ee340661ee09deb6a2
4
- data.tar.gz: c91dee2bcb2e31a776dd8a96c7f1d20080d8282de9715d214f3eaf778bedddf2
3
+ metadata.gz: d62e3e74918cc0fb8fd2a44ffa6607f6d7a287572cbe9babf81f47882ce8a3d0
4
+ data.tar.gz: cca019c472ef786fe7d706eaae189dede52524fa2d26c4fc2f2e33b9cced1a05
5
5
  SHA512:
6
- metadata.gz: 45f1061c0c5589c488e313f1fb01485f41987c942d5ba6c5b04565662bb0fa5d4fb72a9133939e3210a3d559e3736204982ce5e5ad0288ef237ead297677923d
7
- data.tar.gz: 160edfd425928ad48d1a32e5ff8ba144025ea6631f2372636387be441eb0e4349c1b87d22abe2e4344f86d405351294d22003ed44a88a9e4d9884d30a02a4bcf
6
+ metadata.gz: 58083d7dd7588a54b3d872d77f389ad21136274cb96cbb14994bd7a81c7919a3edc6c49d525afb73029a55ef89aec8c5b157568113acaea3691791679f2525a4
7
+ data.tar.gz: 63bac296530375223bd8523ce427d0145ebc6296389c9e5f894919da6df0107d41981bc84f4510556e139394f207a8428453da91b49501e577f8d740170e2bef
data/app/controllers/spree/admin/return_authorizations_controller.rb CHANGED
@@ -7,9 +7,9 @@ module Spree
7
7
  create.fails :load_form_data
8
8
  update.fails :load_form_data
9
9
 
10
- def fire
11
- @return_authorization.send("#{params[:e]}!")
12
- flash[:success] = Spree.t(:return_authorization_updated)
10
+ def cancel
11
+ @return_authorization.cancel!
12
+ flash[:success] = Spree.t(:return_authorization_canceled)
13
13
  redirect_back fallback_location: spree.edit_admin_order_return_authorization_path(@order, @return_authorization)
14
14
  end
15
15
 
data/app/views/spree/admin/images/edit.html.erb CHANGED
@@ -13,7 +13,7 @@
13
13
  <div class="form-group">
14
14
  <div data-hook="thumbnail" class="col-12 col-lg-3 text-center">
15
15
  <%= f.label Spree.t(:thumbnail) %>
16
- <%= link_to image_tag(main_app.url_for(@image.url(:small))), main_app.url_for(@image.url(:product)) %>
16
+ <%= link_to image_tag(main_app.url_for(@image.url(:small))), main_app.rails_blob_url(@image.attachment) %>
17
17
  </div>
18
18
  <div class="col-12 col-lg-9">
19
19
  <%= render partial: 'form', locals: { f: f } %>
data/app/views/spree/admin/images/index.html.erb CHANGED
@@ -38,7 +38,7 @@
38
38
  <% end %>
39
39
  </td>
40
40
  <td class="image">
41
- <%= link_to image_tag(main_app.url_for(image.url(:mini))), main_app.url_for(image.url(:product)) %>
41
+ <%= link_to image_tag(main_app.url_for(image.url(:mini))), main_app.rails_blob_url(image.attachment) %>
42
42
  </td>
43
43
  <% if has_variants %>
44
44
  <td><%= options_text_for(image) %></td>
data/app/views/spree/admin/return_authorizations/edit.html.erb CHANGED
@@ -1,6 +1,6 @@
1
1
  <% content_for :page_actions do %>
2
2
  <% if @return_authorization.can_cancel? %>
3
- <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, icon: "delete" %>
3
+ <%= button_link_to Spree.t('actions.cancel'), cancel_admin_order_return_authorization_url(@order, @return_authorization), method: :put, data: { confirm: Spree.t(:are_you_sure) }, icon: "delete" %>
4
4
  <% end %>
5
5
  <% end %>
6
6
 
data/config/routes.rb CHANGED
@@ -99,7 +99,7 @@ Spree::Core::Engine.add_routes do
99
99
  resources :adjustments
100
100
  resources :return_authorizations do
101
101
  member do
102
- put :fire
102
+ put :cancel
103
103
  end
104
104
  end
105
105
  resources :payments do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0.rc3
4
+ version: 4.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-02-14 00:00:00.000000000 Z
11
+ date: 2020-03-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 4.1.0.rc3
19
+ version: 4.1.0
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: 4.1.0.rc3
26
+ version: 4.1.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 4.1.0.rc3
33
+ version: 4.1.0
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: 4.1.0.rc3
40
+ version: 4.1.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -548,9 +548,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
548
548
  version: 2.5.0
549
549
  required_rubygems_version: !ruby/object:Gem::Requirement
550
550
  requirements:
551
- - - ">"
551
+ - - ">="
552
552
  - !ruby/object:Gem::Version
553
- version: 1.3.1
553
+ version: '0'
554
554
  requirements:
555
555
  - none
556
556
  rubygems_version: 3.0.6