solidus_bolt 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94b2a582685d844a4e3c0b9f5db529400eebffc1c546a0783f68629fa74ca74b
-  data.tar.gz: 5e9b74ce81c07973564709d65920c17ec2fc44d92076c9914eb4da440fee3251
+  metadata.gz: 742875df47de9e63b63e2abb6d986c8e6fda7b1f5298fc49be6e04d06cd5a050
+  data.tar.gz: 8e3f173daca61cb9b03b63ee26d70e06ce0a5462c3803fc9c65150fa1da13cc7
 SHA512:
-  metadata.gz: 4ba2a650993c03f57b304f8f0b3bef38654bdba35ae24d9f155404d5994f1328f8736ce387db46ef16a27454740d9205039256c6ea3535e270c964cedb998106
-  data.tar.gz: abb020bf31418d56d460de9dc07a3e83ce54473ddbc6750e011d51a47abc37a0ffdc62c2f5b73f4417fa86a4823fec9404ea4db0be7d0f01a35333c10ca90c40
+  metadata.gz: a0f3cea501cbc8086af33a9d2871593d4e30e6495807ad2fad05f029711086ec8f2b2d3b6e44149fa838403536129d5a5038347a23a87ff99627a80e3274cd87
+  data.tar.gz: 90901739f3d6cc165309ef2f0528f6f4897ac8598c8434e01322bbae208a5cd58f1154b6a2bddebd57e5b75808010961f3a710eac83f267df38400d6dcbbb248

data/README.md

@@ -13,7 +13,7 @@ Add solidus_bolt to your Gemfile:
 gem 'solidus_bolt'
 ```
 
-Bundle your dependencies and run the installation generator (before running the following command, we recommend setting up the environment variables and seeds as described in the sections below): 
+Bundle your dependencies and run the installation generator (before running the following command, we recommend setting up the environment variables and seeds as described in the sections below):
 
 ```shell
 bin/rails generate solidus_bolt:install
@@ -26,7 +26,6 @@ bin/rails generate solidus_bolt:install
 Many of the API calls handled by this gem use the variables set in Bolt Configuration. Since this extension's seeds automatically generate a Bolt Configuration, the easiest and safest way to configure it would be by setting the following environment variables:
 
 ```
-BOLT_BEARER_TOKEN
 BOLT_ENVIRONMENT
 BOLT_MERCHANT_PUBLIC_ID
 BOLT_DIVISION_PUBLIC_ID
@@ -45,11 +44,11 @@ Provided you setup the environment variables, you can simplify the setup of a Bo
 - AuthenticationMethod
 - PaymentMethod
 
-You can run solidus_bolt's seeds either by running 
+You can run solidus_bolt's seeds either by running
 ```shell
 bin/rails db:seed:solidus_bolt
-``` 
-or by adding the following line to your seed file: 
+```
+or by adding the following line to your seed file:
 ```ruby
 SolidusBolt::Engine.load_seed if defined?(SolidusBolt)
 ```

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

@@ -29,7 +29,6 @@ module Spree
         params
           .require(:solidus_bolt_bolt_configuration)
           .permit(
-            :bearer_token,
             :environment,
             :merchant_public_id,
             :division_public_id,

data/app/models/solidus_bolt/bolt_configuration.rb

@@ -6,7 +6,8 @@ module SolidusBolt
   class BoltConfiguration < ApplicationRecord
     after_commit :update_bolt_config_credentials
 
-    REGISTER_URL = 'https://merchant.bolt.com/register'
+    PRODUCTION_REGISTER_URL = 'https://merchant.bolt.com/register?platform=solidus'
+    SANDBOX_REGISTER_URL = 'https://merchant-sandbox.bolt.com/register?platform=solidus'
     EVENTS = %w[all payment credit capture void auth pending rejected_irreversible rejected_reversible no_op
                 failed_payment newsletter_subscription risk_insights credit_card_deleted].freeze
 

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

@@ -6,8 +6,6 @@
         <div class="col-12">
           <%= f.label :environment %>
           <%= f.select :environment, %w[production sandbox staging] %><br />
-          <%= f.label :bearer_token %>
-          <%= f.text_field :bearer_token, class: 'fullwidth'%>
           <%= f.label 'Merchant Public Id' %><br />
           <%= f.text_field :merchant_public_id, class: 'fullwidth' %>
           <%= f.label 'Division Public Id' %><br />

data/app/views/spree/admin/bolts/show.html.erb

@@ -3,10 +3,12 @@
 <% content_for :page_actions do %>
   <% if SolidusBolt::BoltConfiguration.config_empty? %>
     <li>
-      <p>Don't have a <%= image_tag "bolt_logo_standard.png", alt: "Bolt", width: "40" %> Merchant account yet?</p>
-    </li>
-    <li>
-      <%= link_to t('spree.admin.bolt.create_merchant_account'), SolidusBolt::BoltConfiguration::REGISTER_URL, class: 'btn btn-primary', target: '_blank' %>
+      <%= raw t(
+        'spree.admin.bolt.register_merchant_account',
+        production_link: link_to(t('spree.admin.bolt.production'), SolidusBolt::BoltConfiguration::PRODUCTION_REGISTER_URL, target: '_blank'),
+        sandbox_link: link_to(t('spree.admin.bolt.sandbox'), SolidusBolt::BoltConfiguration::SANDBOX_REGISTER_URL, target: '_blank'),
+        bolt_image: image_tag("bolt_logo_standard.png", alt: "Bolt", width: "40")
+        ) %>
     </li>
   <% else %>
     <li>

data/config/locales/en.yml

@@ -12,6 +12,8 @@ en:
         configuration_not_found: 'No Bolt Configuration found'
         edit_configuration: 'Edit Bolt Configuration'
         updated_successfully: 'Bolt Configuration Updated Successfully'
-        create_merchant_account: 'Create Merchant Account'
+        register_merchant_account: Create a %{production_link} or %{sandbox_link} merchant account with %{bolt_image}
+        production: Production
+        sandbox: Sandbox
       tab:
         bolt: 'Bolt'

data/db/migrate/20220629131950_remove_bearer_token_on_solidus_bolt_bolt_configuration.rb

@@ -0,0 +1,5 @@
+class RemoveBearerTokenOnSolidusBoltBoltConfiguration < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :solidus_bolt_bolt_configurations, :bearer_token, :string
+  end
+end

data/db/seeds.rb

@@ -2,7 +2,6 @@
 
 solidus_bolt_configuration = SolidusBolt::BoltConfiguration.fetch
 
-solidus_bolt_configuration.bearer_token = ENV['BOLT_BEARER_TOKEN']
 solidus_bolt_configuration.environment = ENV['BOLT_ENVIRONMENT']
 solidus_bolt_configuration.merchant_public_id = ENV['BOLT_MERCHANT_PUBLIC_ID']
 solidus_bolt_configuration.division_public_id = ENV['BOLT_DIVISION_PUBLIC_ID']

data/lib/solidus_bolt/testing_support/factories.rb

@@ -2,7 +2,6 @@
 
 FactoryBot.define do
   factory :bolt_configuration, class: SolidusBolt::BoltConfiguration do
-    bearer_token { SecureRandom.hex }
     environment { 'sandbox' }
     merchant_public_id { SecureRandom.hex }
     division_public_id { SecureRandom.hex }

data/lib/solidus_bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBolt
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/solidus_bolt.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'coffee-rails'
   spec.add_dependency 'deface'
   spec.add_dependency 'httparty'
+  spec.add_dependency 'multi_json'
   spec.add_dependency 'omniauth-bolt'
   spec.add_dependency 'rails', ['>0.a', '< 7.a']
   spec.add_dependency 'solidus_auth_devise'

data/spec/models/solidus_bolt/bolt_configuration_spec.rb

@@ -4,7 +4,6 @@ RSpec.describe SolidusBolt::BoltConfiguration, type: :model do
   let(:column_list) {
     [
       'id',
-      'bearer_token',
       'environment',
       'merchant_public_id',
       'division_public_id',
@@ -47,7 +46,6 @@ RSpec.describe SolidusBolt::BoltConfiguration, type: :model do
     it 'is true for a record with empty fields' do
       create(
         :bolt_configuration,
-        bearer_token: '',
         merchant_public_id: '',
         division_public_id: '',
         api_key: '',

data/spec/requests/spree/admin/bolt_spec.rb

@@ -5,7 +5,6 @@ RSpec.describe "Spree::Admin::Bolts", type: :request do
 
   let(:bolt_configuration_params) {
     {
-      bearer_token: SecureRandom.hex,
       environment: 'sandbox',
       merchant_public_id: SecureRandom.hex,
       division_public_id: SecureRandom.hex,
@@ -56,7 +55,6 @@ RSpec.describe "Spree::Admin::Bolts", type: :request do
       request
 
       updated_attributes = SolidusBolt::BoltConfiguration.fetch.attributes.slice(
-        'bearer_token',
         'environment',
         'merchant_public_id',
         'division_public_id',

data/spec/support/bolt_configuration.rb

@@ -4,7 +4,6 @@ RSpec.configure do |config|
   config.before(:example, :bolt_configuration) do
     solidus_bolt_configuration = SolidusBolt::BoltConfiguration.fetch
 
-    solidus_bolt_configuration.bearer_token = ENV['BOLT_BEARER_TOKEN']
     solidus_bolt_configuration.environment = 'sandbox'
     solidus_bolt_configuration.merchant_public_id = ENV['BOLT_MERCHANT_PUBLIC_ID']
     solidus_bolt_configuration.division_public_id = ENV['BOLT_DIVISION_PUBLIC_ID']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bolt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - piyushswain
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -54,6 +54,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: omniauth-bolt
   requirement: !ruby/object:Gem::Requirement
@@ -320,6 +334,7 @@ files:
 - db/migrate/20220526005619_remove_user_id_from_solidus_bolt_payment_source.rb
 - db/migrate/20220530102107_rename_bolt_configuration_merchant_id_to_division_public_id.rb
 - db/migrate/20220531075527_update_bolt_configuration_environment_column_restrictions.rb
+- db/migrate/20220629131950_remove_bearer_token_on_solidus_bolt_bolt_configuration.rb
 - db/seeds.rb
 - lib/generators/solidus_bolt/install/install_generator.rb
 - lib/generators/solidus_bolt/install/templates/initializer.rb