solidus_backend 2.3.0.beta1 → 2.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cebe06f697d76eeeeb4f0127598a92a3bac822e1
-  data.tar.gz: f6d8aadac696b01eddbe0eeeb20ebc350b086991
+  metadata.gz: b5cbbe47bd70d04268f20babdfea7cf0ceb3d34a
+  data.tar.gz: 6f8082e77de692e7adaae77a4a935020840759ea
 SHA512:
-  metadata.gz: d66d74dc75f5cd2c9f9cc2e793896e7a938ec3549f4a0d2e92096a8f36041a943a19a10e8c776af35691f33cc325a13d6d50c04a7da8e5842ba53a33ee6638f0
-  data.tar.gz: bd40e9bf6e7e06f667970d34cbb7389b320b0752a68fc7d112acfec8d8d959253eac2fa555e55218aa83e8564a58a4664092fb468dc33111e10746e3fbb89078
+  metadata.gz: 6c32505302d974f6aa6321cad782c7891cae551114820453da561cbe539b147d811f8901ad4354f223a1e54d89cc9d6eb7c3034b11da4a1e0b1cf22fb7f7e20b
+  data.tar.gz: 25e6fbff2330f89b48d72a453db44d45d8c6c3cda34f4fde47e7090eda60d3d273cc5b184adc65535abf02c939f8ba53e5cb43550d15f83823e5282dfae3fd8b

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

@@ -77,13 +77,7 @@ module Spree
       end
 
       def payment_method_params
-        superclass_params = params.require(:payment_method).permit!
-        subclass_params = params[ActiveModel::Naming.param_key(@payment_method_type)] || ActionController::Parameters.new
-
-        superclass_params = superclass_params.permit!
-        subclass_params = subclass_params.permit!
-
-        superclass_params.to_h.merge(subclass_params.to_h)
+        params.require(:payment_method).permit!
       end
     end
   end

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

@@ -3,11 +3,11 @@
   <div data-hook="payment_method">
 
     <div class="row">
-      <div class="col-3">
+      <div class="col-4">
         <div id="preference-settings">
           <div class="field">
-            <%= label :payment_method, :type %>
-            <%= collection_select(:payment_method, :type, @payment_method_types, :to_s, :name, {}, {class: 'custom-select fullwidth js-gateway-type'}) %>
+            <%= f.label :type %>
+            <%= f.select :type, @payment_method_types.map { |p| [p.model_name.human, p.to_s] }, {}, {class: 'custom-select fullwidth js-gateway-type'} %>
           </div>
 
           <div class="field js-preference-source-wrapper">
@@ -25,34 +25,25 @@
 
           <div class="info warning js-gateway-settings-warning"><%= Spree.t(:payment_method_settings_warning) %></div>
         </div>
+        <div data-hook="auto_capture" class="field">
+          <%= f.label :auto_capture %>
+          <%= f.select :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'custom-select fullwidth'} %>
+        </div>
         <div data-hook="available_to_user" class="field">
-          <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:available_to_users) %>
           <%= f.check_box :available_to_users %>
+          <%= f.label :available_to_users %>
         </div>
         <div data-hook="available_to_user" class="field">
-          <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:available_to_admin) %>
           <%= f.check_box :available_to_admin %>
-        </div>
-        <div data-hook="auto_capture" class="field">
-          <%= f.label :auto_capture %>
-          <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'custom-select fullwidth'}) %>
+          <%= f.label :available_to_admin %>
         </div>
         <div data-hook="active" class="field">
-          <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:active) %>
-          <ul>
-            <li>
-              <%= radio_button :payment_method, :active, true %>
-              <%= label_tag :payment_method_active_true, Spree.t(:say_yes) %>
-            </li>
-            <li>
-              <%= radio_button :payment_method, :active, false %>
-              <%= label_tag :payment_method_active_false, Spree.t(:say_no) %>
-            </li>
-          </ul>
+          <%= f.check_box :active %>
+          <%= f.label :active %>
         </div>
       </div>
 
-      <div class="col-6">
+      <div class="col-8">
         <div data-hook="name" class="field">
           <%= f.label :name %>
           <%= f.text_field :name, class: 'fullwidth' %>

data/app/views/spree/admin/payment_methods/edit.html.erb

@@ -10,7 +10,7 @@
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @payment_method } %>
 
-<%= form_for @payment_method, url: admin_payment_method_path(@payment_method) do |f| %>
+<%= form_for @payment_method, as: :payment_method, url: admin_payment_method_path(@payment_method) do |f| %>
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="buttons" class="filter-actions actions">

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

@@ -40,7 +40,7 @@
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows" class="<%= cycle('odd', 'even')%>">
           <td class="no-border"><span class="handle"></span></td>
           <td class="align-center"><%= method.name %></td>
-          <td class="align-center"><%= method.type %></td>
+          <td class="align-center"><%= method.model_name.human %></td>
           <td class="align-center"><%= method.available_to_users ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="align-center"><%= method.available_to_admin ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="align-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>

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

@@ -11,7 +11,7 @@
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @payment_method } %>
 
-<%= form_for @payment_method, url: collection_url do |f| %>
+<%= form_for @payment_method, as: :payment_method, url: collection_url do |f| %>
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="buttons" class="filter-actions actions">

data/spec/features/admin/configuration/payment_methods_spec.rb

@@ -23,7 +23,7 @@ describe "Payment Methods", type: :feature do
       end
 
       within('table#listing_payment_methods') do
-        expect(page).to have_content("Spree::PaymentMethod::Check")
+        expect(page).to have_content(Spree::PaymentMethod::Check.model_name.human)
       end
     end
   end
@@ -35,7 +35,7 @@ describe "Payment Methods", type: :feature do
       expect(page).to have_content("New Payment Method")
       fill_in "payment_method_name", with: "check90"
       fill_in "payment_method_description", with: "check90 desc"
-      select "Spree::PaymentMethod::Check", from: "Type"
+      select Spree::PaymentMethod::Check.model_name.human, from: "Type"
       click_button "Create"
       expect(page).to have_content("successfully created!")
     end
@@ -51,14 +51,14 @@ describe "Payment Methods", type: :feature do
     end
 
     it "should be able to edit an existing payment method" do
-      fill_in "payment_method_check_name", with: "Payment 99"
+      fill_in "payment_method_name", with: "Payment 99"
       click_button "Update"
       expect(page).to have_content("successfully updated!")
-      expect(page).to have_field("payment_method_check_name", with: "Payment 99")
+      expect(page).to have_field("payment_method_name", with: "Payment 99")
     end
 
     it "should display validation errors" do
-      fill_in "payment_method_check_name", with: ""
+      fill_in "payment_method_name", with: ""
       click_button "Update"
       expect(page).to have_content("Name can't be blank")
     end
@@ -76,12 +76,12 @@ describe "Payment Methods", type: :feature do
       click_icon :edit
       expect(page).to have_content('Test Mode')
 
-      select 'Spree::PaymentMethod::Check', from: 'Type'
+      select Spree::PaymentMethod::Check.model_name.human, from: 'Type'
       expect(page).to have_content('you must save first')
       expect(page).to have_no_content('Test Mode')
 
       # change back
-      select 'Spree::PaymentMethod::BogusCreditCard', from: 'Type'
+      select Spree::PaymentMethod::BogusCreditCard.model_name.human, from: 'Type'
       expect(page).to have_no_content('you must save first')
       expect(page).to have_content('Test Mode')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.3.0.beta1
+  version: 2.3.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-20 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.3.0.beta1
+        version: 2.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0.beta1
+        version: 2.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0.beta1
+        version: 2.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0.beta1
+        version: 2.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement