solidus_braintree 2.0.0 → 3.0.0

data/{app/assets/javascripts → lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend}/solidus_braintree/paypal_button.js

@@ -1,4 +1,4 @@
-//= require solidus_braintree/constants
+//= require spree/frontend/solidus_braintree/constants
 /**
  * Constructor for PayPal button object
  * @constructor
@@ -99,7 +99,7 @@ SolidusBraintree.PaypalButton.prototype._tokenizeCallback = function(tokenizeErr
 
   var params = this._transactionParams(payload);
 
-  return Spree.ajax({
+  return SolidusBraintree.ajax({
     url: SolidusBraintree.config.paths.transactions,
     type: 'POST',
     dataType: 'json',

data/{app/assets/javascripts → lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend}/solidus_braintree/paypal_messaging.js

@@ -1,4 +1,4 @@
-//= require solidus_braintree/constants
+//= require spree/frontend/solidus_braintree/constants
 
 SolidusBraintree.PaypalMessaging = function(paypalOptions) {
   this._paypalOptions = paypalOptions || {};

data/lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/promise.js

@@ -0,0 +1,20 @@
+SolidusBraintree.PromiseShim = {
+  convertBraintreePromise: function(fn, args, context) {
+    var jqPromise  = $.Deferred();
+
+    args = args || [];
+    context = context || this;
+
+    args = args.concat(function(error, data) {
+      if (error) {
+        jqPromise.reject(error);
+      } else {
+        jqPromise.resolve(data);
+      }
+    });
+
+    fn.apply(context, args);
+
+    return jqPromise.promise();
+  }
+}

data/{app/assets/javascripts → lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend}/solidus_braintree/venmo_button.js

@@ -1,4 +1,4 @@
-//= require solidus_braintree/constants
+//= require spree/frontend/solidus_braintree/constants
 /**
  * Constructor for Venmo button object
  * @constructor

data/lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree.js

@@ -0,0 +1 @@
+//= require spree/frontend/solidus_braintree/frontend

data/{app → lib/generators/solidus_braintree/install/templates/app}/assets/stylesheets/spree/frontend/solidus_braintree.scss

@@ -49,3 +49,14 @@ the installer will append this file to the app vendored assets here: 'vendor/ass
 .venmo-button.visible {
   visibility: visible;
 }
+
+/*
+WORKAROUND: Do not allow buttons in disabled payment-step to be clickable. Note
+that it's still possible to trigger the PayPal button iframe by tabbing to it
+and hitting enter.
+*/
+fieldset.payment-step__details:disabled {
+  #apple-pay-button, #paypal-button iframe, #venmo-button {
+    pointer-events: none;
+  }
+}

data/lib/{controllers/frontend → generators/solidus_braintree/install/templates/app/controllers}/solidus_braintree/checkouts_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusBraintree
-  class CheckoutsController < ::Spree::CheckoutController
+  class CheckoutsController < CheckoutsController
     PERMITTED_PAYMENT_PARAMS = [
       :payment_method_id,
       { source_attributes: [

data/lib/{controllers/frontend → generators/solidus_braintree/install/templates/app/controllers}/solidus_braintree/transactions_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusBraintree
-  class TransactionsController < ::Spree::StoreController
+  class TransactionsController < StoreController
     class InvalidImportError < StandardError; end
 
     PERMITTED_BRAINTREE_TRANSACTION_PARAMS = [
@@ -48,9 +48,9 @@ module SolidusBraintree
 
     def redirect_url(import)
       if import.order.complete?
-        spree.order_url(import.order)
+        main_app.order_url(import.order)
       else
-        spree.checkout_state_url(import.order.state)
+        main_app.checkout_state_url(import.order.state)
       end
     end
 

data/lib/generators/solidus_braintree/install/templates/app/views/checkouts/existing_payment/_braintree.html.erb

@@ -0,0 +1,2 @@
+<%= wallet_payment_source.payment_source.friendly_payment_type %>
+<%= wallet_payment_source.payment_source.display_number %>

data/lib/{views/frontend/spree/checkout → generators/solidus_braintree/install/templates/app/views/checkouts}/payment/_braintree.html.erb

@@ -7,7 +7,7 @@
 <% end %>
 
 <% if current_store.braintree_configuration.credit_card? %>
-  <fieldset class="braintree-hosted-fields" data-braintree-hosted-fields data-id="<%= id %>">
+  <fieldset class="braintree-hosted-fields" data-braintree-hosted-fields data-id="<%= id %>" data-use-data-collector="<%= SolidusBraintree::Gateway.first.preferred_use_data_collector %>">
     <%= render "spree/shared/braintree_hosted_fields", payment_method: payment_method %>
   </fieldset>
 <% end %>

data/lib/{views/frontend/solidus_braintree/payments/_payment.html.erb → generators/solidus_braintree/install/templates/app/views/payments/_braintree_payment_details.html.erb}

@@ -1,12 +1,9 @@
-<br />
 <%= payment.source.try(:display_payment_type) %>
 
 <% if payment.source.try(:paypal?) %>
   <% if payment.source.respond_to?(:paypal_funding_source) && payment.source.paypal_funding_source.present? %>
-    <br />
     <%= t('spree.paypal_funding', funding: payment.source.display_paypal_funding_source) %>
   <% end %>
 <% elsif payment.source.try(:venmo?) %>
-  <br />
   <%= payment.source.source_description %>
 <% end %>

data/{app → lib/generators/solidus_braintree/install/templates/app}/views/spree/shared/_apple_pay_button.html.erb

@@ -1,4 +1,4 @@
-<% address = current_order.ship_address %>
+<% address = SolidusBraintree::Address.new(current_order.ship_address) %>
 
 <button id="apple-pay-button" class="apple-pay-button"></button>
 

data/{app → lib/generators/solidus_braintree/install/templates/app}/views/spree/shared/_braintree_head_scripts.html.erb

@@ -22,5 +22,5 @@
     <script src="https://js.braintreegateway.com/web/3.84.0/js/venmo.min.js"></script>
   <% end %>
 
-  <%= javascript_include_tag "solidus_braintree/checkout" %>
+  <%= javascript_include_tag "spree/frontend/solidus_braintree/checkout" %>
 <% end %>

data/{app → lib/generators/solidus_braintree/install/templates/app}/views/spree/shared/_braintree_hosted_fields.html.erb

@@ -22,15 +22,12 @@
   <div class="field" data-hook="card_code">
     <%= label_tag "card_code#{payment_method.id}", Spree::CreditCard.human_attribute_name(:card_code), class: "required" %>
     <div class="input" id="card_code<%= payment_method.id %>"></div>
-
-    <a href="/content/cvv" class="info cvvLink" target="_blank">
-      (<%= I18n.t("spree.what_is_this") %>)
-    </a>
   </div>
 
   <div class="clear"></div>
   <input type="hidden" name="<%= prefix %>[payment_type]" value="<%= SolidusBraintree::Source::CREDIT_CARD %>">
   <input type="hidden" id="payment_method_nonce" name="<%= prefix %>[nonce]">
+  <input type="hidden" id="device_data" name="<%= prefix %>[device_data]">
 </div>
 
 

data/lib/solidus_braintree/engine.rb

@@ -18,21 +18,26 @@ module SolidusBraintree
       config.to_prepare do
         app.config.spree.payment_methods << SolidusBraintree::Gateway
         SolidusBraintree::Gateway.allowed_admin_form_preference_types.push(:preference_select).uniq!
-        ::Spree::PermittedAttributes.source_attributes.concat([:nonce, :payment_type, :paypal_funding_source]).uniq!
+
+        ::Spree::PermittedAttributes.source_attributes.concat(
+          [:nonce, :payment_type, :paypal_funding_source, :device_data]
+        ).uniq!
       end
     end
 
-    if SolidusSupport.frontend_available?
-      config.assets.precompile += [
-        'solidus_braintree/checkout.js',
-        'solidus_braintree/frontend.js',
-        'spree/frontend/apple_pay_button.js',
-        'solidus_braintree_manifest.js'
-      ]
-      paths["app/controllers"] << "lib/controllers/frontend"
-      paths["app/views"] << "lib/views/frontend"
+    initializer 'add_solidus_braintree_response_to_log_entry_permitted_classes' do
+      Spree.config do |config|
+        config.log_entry_permitted_classes << 'SolidusBraintree::Response'
+      end
     end
 
+    config.assets.precompile += [
+      'spree/frontend/solidus_braintree/checkout.js',
+      'solidus_braintree_manifest.js'
+    ]
+    paths["app/controllers"] << "lib/controllers/frontend"
+    paths["app/views"] << "lib/views/frontend"
+
     if SolidusSupport.backend_available?
       config.assets.precompile += ["spree/backend/solidus_braintree.js"]
       paths["app/controllers"] << "lib/controllers/backend"

data/lib/solidus_braintree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBraintree
-  VERSION = '2.0.0'
+  VERSION = '3.0.0'
 end

data/solidus_braintree.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/solidusio/solidus_braintree'
   spec.metadata['changelog_uri'] = 'https://github.com/solidusio/solidus_braintree/blob/master/CHANGELOG.md'
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 4')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7', '< 4')
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -31,14 +31,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activemerchant', '~> 1.48'
   spec.add_dependency 'braintree', '~> 3.4'
-  spec.add_dependency 'solidus_api', ['>= 2.4.0', '< 4']
-  spec.add_dependency 'solidus_core', ['>= 2.4.0', '< 4']
+  spec.add_dependency 'solidus_api', ['>= 3.4.0.dev', '< 4']
+  spec.add_dependency 'solidus_core', ['>= 3.4.0.dev', '< 4']
   spec.add_dependency 'solidus_support', ['>= 0.8.1', '< 1']
 
   spec.add_development_dependency 'rails-controller-testing'
   spec.add_development_dependency 'solidus_dev_support', '~> 2.5'
-  spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'webmock'
 
   spec.post_install_message = "If you're upgrading to v2.0.0, please see the README for upgrade instructions."
 end

data/spec/controllers/solidus_braintree/checkouts_controller_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'support/order_ready_for_payment'
+require 'solidus_braintree_helper'
+require 'support/solidus_braintree/order_ready_for_payment'
 
 RSpec.describe SolidusBraintree::CheckoutsController, type: :controller do
   routes { SolidusBraintree::Engine.routes }

data/spec/controllers/solidus_braintree/client_tokens_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe SolidusBraintree::ClientTokensController do
+RSpec.describe SolidusBraintree::ClientTokensController do
   routes { SolidusBraintree::Engine.routes }
 
   cassette_options = { cassette_name: "braintree/token" }

data/spec/controllers/solidus_braintree/configurations_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe SolidusBraintree::ConfigurationsController, type: :controller do
+RSpec.describe SolidusBraintree::ConfigurationsController, type: :controller do
   routes { SolidusBraintree::Engine.routes }
 
   let!(:store_1) { create :store }

data/spec/controllers/solidus_braintree/transactions_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
 RSpec.describe SolidusBraintree::TransactionsController, type: :controller do
   routes { SolidusBraintree::Engine.routes }
@@ -130,7 +130,7 @@ RSpec.describe SolidusBraintree::TransactionsController, type: :controller do
       context "when format is HTML" do
         context "when import! leaves the order in confirm" do
           it "redirects the user to the confirm page" do
-            expect(post_create).to redirect_to spree.checkout_state_path("confirm")
+            expect(post_create).to redirect_to '/checkout/confirm'
           end
         end
 
@@ -138,7 +138,7 @@ RSpec.describe SolidusBraintree::TransactionsController, type: :controller do
           before { allow(order).to receive(:complete?).and_return(true) }
 
           it "displays the order to the user" do
-            expect(post_create).to redirect_to spree.order_path(order)
+            expect(post_create).to redirect_to "/orders/#{order.number}"
           end
         end
       end

data/spec/fixtures/views/carts/_cart_footer.html.erb

@@ -0,0 +1,18 @@
+<% order = order_form.object %>
+
+<footer class="cart-footer">
+  <p class="cart-footer__total">
+    <%= t('spree.total') %>: <strong><%= order.display_total %></strong>
+  </p>
+
+  <div class="cart-footer__primary-action">
+    <%= order_form.button(
+      I18n.t('spree.checkout'),
+      class: 'button-primary',
+      id: 'checkout-link',
+      name: :checkout
+    ) %>
+  </div>
+
+  <%= render "spree/shared/paypal_cart_button" %>
+</footer>

data/spec/helpers/solidus_braintree/braintree_admin_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
 RSpec.describe SolidusBraintree::BraintreeAdminHelper do
   describe '#braintree_transaction_link' do

data/spec/helpers/solidus_braintree/braintree_checkout_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
 RSpec.describe SolidusBraintree::BraintreeCheckoutHelper do
   let!(:store) { create :store }

data/spec/models/solidus_braintree/address_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
 RSpec.describe SolidusBraintree::Address do
   describe "::split_name" do

data/spec/models/solidus_braintree/avs_result_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
 RSpec.describe SolidusBraintree::AVSResult do
   describe 'AVS response message' do

data/spec/models/solidus_braintree/gateway_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 require 'webmock'
-require 'support/order_ready_for_payment'
+require 'support/solidus_braintree/order_ready_for_payment'
 
 RSpec.describe SolidusBraintree::Gateway do
   let(:gateway) do
@@ -16,7 +16,8 @@ RSpec.describe SolidusBraintree::Gateway do
       nonce: 'fake-valid-nonce',
       user: user,
       payment_type: payment_type,
-      payment_method: gateway
+      payment_method: gateway,
+      device_data: 'fake-device-data'
     )
   end
 
@@ -220,6 +221,37 @@ RSpec.describe SolidusBraintree::Gateway do
           expect(authorize.message).to eq 'authorized'
           expect(authorize.authorization).to be_present
         end
+
+        context 'with available device data' do
+          it 'passes the device data as a parameter in the request' do
+            expect_any_instance_of(Braintree::TransactionGateway).
+              to receive(:sale).
+              with(hash_including({ device_data: "fake-device-data" })).and_call_original
+            authorize
+          end
+        end
+
+        context 'without device_data' do
+          let(:source) do
+            SolidusBraintree::Source.create!(
+              nonce: 'fake-valid-nonce',
+              user: user,
+              payment_type: payment_type,
+              payment_method: gateway
+            )
+          end
+
+          before do
+            allow_any_instance_of(Braintree::TransactionGateway).to receive(:sale).and_call_original
+          end
+
+          it 'does not pass any device data in the request' do
+            expect_any_instance_of(Braintree::TransactionGateway)
+              .not_to receive(:sale).with(hash_including({ device_data: "" }))
+
+            authorize
+          end
+        end
       end
 
       context 'with different merchant account for currency', vcr: {

data/spec/models/solidus_braintree/response_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
 RSpec.describe SolidusBraintree::Response do
   let(:failed_transaction) { nil }

data/spec/models/solidus_braintree/source_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
+require 'support/solidus_braintree/order_ready_for_payment'
 
 RSpec.describe SolidusBraintree::Source, type: :model do
   include_context 'when order is ready for payment'
@@ -536,4 +537,19 @@ RSpec.describe SolidusBraintree::Source, type: :model do
       it { is_expected.to be_falsy }
     end
   end
+
+  describe "#device_data" do
+    let(:payment_source) { build(:solidus_braintree_source) }
+
+    context "when blank on validation" do
+      before do
+        payment_source.device_data = ""
+        payment_source.valid?
+      end
+
+      it "is set to nil" do
+        expect(payment_source.device_data).to be_nil
+      end
+    end
+  end
 end

data/spec/models/solidus_braintree/transaction_address_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe SolidusBraintree::TransactionAddress do
+RSpec.describe SolidusBraintree::TransactionAddress do
   describe "#valid?" do
     subject { address.valid? }
 

data/spec/models/solidus_braintree/transaction_import_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe SolidusBraintree::TransactionImport do
+RSpec.describe SolidusBraintree::TransactionImport do
   let(:order) { Spree::Order.new }
   let!(:country) { create :country, iso: "US" }
   let(:braintree_gateway) { SolidusBraintree::Gateway.new }

data/spec/models/solidus_braintree/transaction_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe SolidusBraintree::Transaction do
+RSpec.describe SolidusBraintree::Transaction do
   describe "#valid?" do
     subject { transaction.valid? }
 

data/spec/models/spree/store_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe Spree::Store do
+RSpec.describe Spree::Store do
   describe 'before_create :build_default_configuration' do
     context 'when a braintree_configuration record already exists' do
       it 'does not overwrite it' do

data/spec/requests/spree/api/orders_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe Spree::Api::OrdersController, type: :request do
+RSpec.describe Spree::Api::OrdersController, type: :request do
   stub_authorization!
 
   describe 'get show' do

data/spec/solidus_braintree_helper.rb

@@ -0,0 +1,7 @@
+require 'solidus_starter_frontend_helper'
+
+require 'support/solidus_braintree/capybara'
+require 'support/solidus_braintree/factories'
+require 'support/solidus_braintree/gateway_helpers'
+require 'support/solidus_braintree/order_walkthrough'
+require 'support/solidus_braintree/vcr'

data/{lib/solidus_braintree/testing_support → spec/support/solidus_braintree}/factories.rb

@@ -28,26 +28,28 @@ FactoryBot.define do
       payment_type { SolidusBraintree::Source::APPLE_PAY }
     end
   end
-end
 
-FactoryBot.modify do
-  # The Solidus address factory randomizes the zipcode.
-  # The OrderWalkThrough we use in the credit card checkout spec uses this factory for the user addresses.
-  # For credit card payments we transmit the billing address to braintree, for paypal payments the shipping address.
-  # As we match the body in our VCR settings VCR can not match the request anymore and therefore cannot replay existing
-  # cassettes.
-  #
+  factory :solidus_braintree_address, parent: :address do
+    trait :with_fixed_zipcode do
+      # The Solidus address factory randomizes the zipcode. The OrderWalkThrough
+      # we use in the credit card checkout spec uses this factory for the user
+      # addresses. For credit card payments we transmit the billing address to
+      # braintree, for paypal payments the shipping address. As we match the
+      # body in our VCR settings VCR can not match the request anymore and
+      # therefore cannot replay existing cassettes.
 
-  factory :address do
-    zipcode { '21088-0255' }
+      zipcode { '21088-0255' }
+    end
 
     if SolidusSupport.combined_first_and_last_name_in_address?
-      transient do
-        firstname { "John" }
-        lastname { "Doe" }
-      end
+      trait :with_first_and_last_name do
+        transient do
+          firstname { "John" }
+          lastname { "Doe" }
+        end
 
-      name { "#{firstname} #{lastname}" }
+        name { "#{firstname} #{lastname}" }
+      end
     end
   end
 end

data/spec/support/{order_ready_for_payment.rb → solidus_braintree/order_ready_for_payment.rb}

@@ -1,8 +1,15 @@
-shared_context 'when order is ready for payment' do
+RSpec.shared_context 'when order is ready for payment' do
   let!(:country) { create :country }
 
   let(:user) { create :user }
-  let(:address) { create :address, zipcode: "90210", lastname: "Doe", country: country }
+
+  let(:address) do
+    create :solidus_braintree_address,
+      :with_first_and_last_name,
+      zipcode: "90210",
+      lastname: "Doe",
+      country: country
+  end
 
   before do
     create :shipping_method, cost: 5

data/spec/support/solidus_braintree/order_walkthrough.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module SolidusBraintree
+  class OrderWalkthrough
+    def self.up_to(state, user: nil)
+      new.up_to(state, user: user)
+    end
+
+    def up_to(state, user: nil)
+      # Need to create a valid zone too...
+      @zone = ::FactoryBot.create(:zone)
+      @country = ::FactoryBot.create(:country)
+      @state = ::FactoryBot.create(:state, country: @country)
+
+      @zone.members << ::Spree::ZoneMember.create(zoneable: @country)
+
+      # A shipping method must exist for rates to be displayed on checkout page
+      ::FactoryBot.create(:shipping_method, zones: [@zone]).tap do |sm|
+        sm.calculator.preferred_amount = 10
+        sm.calculator.preferred_currency = ::Spree::Config[:currency]
+        sm.calculator.save
+      end
+
+      order = ::Spree::Order.create!(
+        user: user,
+        email: "solidus@example.com",
+        store: ::Spree::Store.first || ::FactoryBot.create(:store)
+      )
+      add_line_item!(order)
+      order.next!
+
+      states_to_process = if state == :complete
+                            states
+                          else
+                            end_state_position = states.index(state.to_sym)
+                            states[..end_state_position]
+                          end
+
+      states_to_process.each do |state_to_process|
+        send(state_to_process, order)
+      end
+
+      order
+    end
+
+    private
+
+    def add_line_item!(order)
+      ::FactoryBot.create(:line_item, order: order)
+      order.reload
+    end
+
+    def address(order)
+      order.bill_address =
+        ::FactoryBot.create(:solidus_braintree_address, :with_fixed_zipcode, country: @country, state: @state)
+
+      order.ship_address =
+        ::FactoryBot.create(:solidus_braintree_address, :with_fixed_zipcode, country: @country, state: @state)
+
+      order.next!
+    end
+
+    def delivery(order)
+      order.next!
+    end
+
+    def payment(order)
+      credit_card = ::FactoryBot.create(:credit_card, user: order.user)
+      order.payments.create!(payment_method: credit_card.payment_method, amount: order.total, source: credit_card)
+      # TODO: maybe look at some way of making this payment_state change automatic
+      order.payment_state = 'paid'
+      order.next!
+    end
+
+    def confirm(order)
+      order.complete!
+    end
+
+    def complete(order)
+      # noop?
+    end
+
+    def states
+      [:address, :delivery, :payment, :confirm]
+    end
+  end
+end