solidus_bolt 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742875df47de9e63b63e2abb6d986c8e6fda7b1f5298fc49be6e04d06cd5a050
-  data.tar.gz: 8e3f173daca61cb9b03b63ee26d70e06ce0a5462c3803fc9c65150fa1da13cc7
+  metadata.gz: e25dd3c40e487372056178b18ffae03f5cddbd5b56756cf32874a7e0f761a5ac
+  data.tar.gz: 74bfbc7db9a0b6b9b47f501cbd67d6c141a9164549266eb99114a3de5a4de840
 SHA512:
-  metadata.gz: a0f3cea501cbc8086af33a9d2871593d4e30e6495807ad2fad05f029711086ec8f2b2d3b6e44149fa838403536129d5a5038347a23a87ff99627a80e3274cd87
-  data.tar.gz: 90901739f3d6cc165309ef2f0528f6f4897ac8598c8434e01322bbae208a5cd58f1154b6a2bddebd57e5b75808010961f3a710eac83f267df38400d6dcbbb248
+  metadata.gz: 6df41aae33da5dc6d3c070507fe0c7a19410ece8ffabfef114f8dca23a387b5f3cdadb0317ef1121051d95807b08717782db0e802290668e277f7ae492f4464e
+  data.tar.gz: 840b8836eaf726ab402b807bed737d536c14adaac70d24d0bba4a030afd58d8677d715ae54ddcd8a2167f3ab4a829a39dcf49e7aefb028064bfd8f539722c49a

data/README.md

@@ -27,8 +27,6 @@ Many of the API calls handled by this gem use the variables set in Bolt Configur
 
 ```
 BOLT_ENVIRONMENT
-BOLT_MERCHANT_PUBLIC_ID
-BOLT_DIVISION_PUBLIC_ID
 BOLT_API_KEY
 BOLT_SIGNING_SECRET
 BOLT_PUBLISHABLE_KEY

data/app/assets/javascripts/solidus_bolt.js

@@ -16,6 +16,8 @@ const tokenize = async (paymentField, paymentMethodId, frontend) => {
     if (result["token"]) {
       updateOrder(result, paymentMethodId, frontend)
     } else {
+      const submitButton = document.getElementById("bolt-submit-button")
+      submitButton.disabled = false;
       console.log(`error ${result["type"]}: ${result["message"]}`);
     }
   });
@@ -29,6 +31,11 @@ const redirectToNextStep = (frontend) => {
   }
 }
 
+async function getResponseText(response) {
+  const text = await response.text();
+  return text;
+}
+
 const updateOrder = async (card, paymentMethodId, frontend) => {
   await fetch(`/api/checkouts/${Spree.current_order_id}`, {
     method: 'PATCH',
@@ -37,6 +44,7 @@ const updateOrder = async (card, paymentMethodId, frontend) => {
       'X-Spree-Order-Token': Spree.current_order_token
     },
     body: JSON.stringify({
+      'state': 'payment',
       'order': {
         'payments_attributes': [{
           'payment_method_id': paymentMethodId,
@@ -53,8 +61,14 @@ const updateOrder = async (card, paymentMethodId, frontend) => {
       }
     })
   })
-  .then(() => {
-    redirectToNextStep(frontend)
+  .then((response) => {
+    if(response.ok) {
+      redirectToNextStep(frontend)
+    } else {
+      getResponseText(response).then(text => {
+        console.error(text);
+      });
+    }
   })
   .catch((response) => {
     console.log('Error updating order')
@@ -75,6 +89,8 @@ document.addEventListener("DOMContentLoaded", async function () {
     if(boltContainer.dataset["boltUserSignedIn"] != "true") {
       accountCheckbox = boltEmbedded.create("account_checkbox");
       accountCheckbox.on("change", checked => createBoltAccount = checked);
+    } else {
+      createBoltAccount = true;
     }
     cardButton.addEventListener("click", () => {
       const submitButton = document.getElementById("bolt-submit-button")

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

@@ -30,8 +30,6 @@ module Spree
           .require(:solidus_bolt_bolt_configuration)
           .permit(
             :environment,
-            :merchant_public_id,
-            :division_public_id,
             :api_key,
             :signing_secret,
             :publishable_key

data/app/decorators/models/solidus_bolt/order_decorator.rb

@@ -5,8 +5,10 @@ module SolidusBolt
     def bolt_cart
       {
         total_amount: display_total.cents,
+        tax_amount: display_tax_total.cents,
         order_reference: number,
         currency: currency,
+        shipments: bolt_shipments_payload,
         items: line_items.map do |line_item|
           {
             sku: line_item.sku,
@@ -35,6 +37,10 @@ module SolidusBolt
 
     private
 
+    def bolt_shipments_payload
+      shipments.map(&:bolt_shipment)
+    end
+
     def cents(float)
       (float * 100).to_i
     end

data/app/decorators/models/solidus_bolt/shipment_decorator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module SolidusBolt
+  module ShipmentDecorator
+    def bolt_shipment
+      {
+        shipping_address: order.ship_address.bolt_address(order.email),
+        reference: number,
+        cost: display_total.cents
+      }
+    end
+
+    Spree::Shipment.prepend(self)
+  end
+end

data/app/models/solidus_bolt/bolt_configuration.rb

@@ -15,6 +15,14 @@ module SolidusBolt
 
     validate :config_can_be_created, on: :create
 
+    def merchant_public_id
+      publishable_key.split('.').first
+    end
+
+    def division_public_id
+      publishable_key.split('.').second
+    end
+
     def self.fetch
       first_or_create
     end

data/app/models/solidus_bolt/payment_method.rb

@@ -26,6 +26,12 @@ module SolidusBolt
       bolt_config.environment_url
     end
 
+    def try_void(payment)
+      return false unless payment.source.can_void?(payment)
+
+      gateway.void(payment.response_code, originator: payment)
+    end
+
     private
 
     def bolt_config

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

@@ -2,7 +2,7 @@
   <table class="index">
     <thead>
       <tr>
-        <th><%= SolidusBolt::BoltConfiguration.human_attribute_name(:merchant_public_id) %></th>
+        <th><%= SolidusBolt::BoltConfiguration.human_attribute_name(:publishable_key) %></th>
         <th><%= SolidusBolt::BoltConfiguration.human_attribute_name(:environment) %></th>
         <th><%= SolidusBolt::BoltConfiguration.human_attribute_name(:created_at) %></th>
         <th><%= SolidusBolt::BoltConfiguration.human_attribute_name(:updated_at) %></th>
@@ -11,7 +11,7 @@
     </thead>
     <tbody>
       <tr>
-        <td><%= @bolt_configuration.merchant_public_id %></td>
+        <td><%= @bolt_configuration.publishable_key %></td>
         <td><%= @bolt_configuration.environment %></td>
         <td>
           <%= @bolt_configuration.created_at.to_s(:long) %>

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

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

data/db/migrate/20220725133701_remove_merchant_id_and_division_public_id_on_bolt_configuration.rb

@@ -0,0 +1,6 @@
+class RemoveMerchantIdAndDivisionPublicIdOnBoltConfiguration < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :solidus_bolt_bolt_configurations, :division_public_id, :string
+    remove_column :solidus_bolt_bolt_configurations, :merchant_public_id, :string
+  end
+end

data/db/seeds.rb

@@ -2,9 +2,7 @@
 
 solidus_bolt_configuration = SolidusBolt::BoltConfiguration.fetch
 
-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']
+solidus_bolt_configuration.environment = ENV.fetch('BOLT_ENVIRONMENT', 'sandbox')
 solidus_bolt_configuration.api_key = ENV['BOLT_API_KEY']
 solidus_bolt_configuration.signing_secret = ENV['BOLT_SIGNING_SECRET']
 solidus_bolt_configuration.publishable_key = ENV['BOLT_PUBLISHABLE_KEY']

data/lib/solidus_bolt/testing_support/factories.rb

@@ -3,11 +3,9 @@
 FactoryBot.define do
   factory :bolt_configuration, class: SolidusBolt::BoltConfiguration do
     environment { 'sandbox' }
-    merchant_public_id { SecureRandom.hex }
-    division_public_id { SecureRandom.hex }
     api_key { SecureRandom.hex }
     signing_secret { SecureRandom.hex }
-    publishable_key { SecureRandom.hex }
+    publishable_key { "#{SecureRandom.hex}.#{SecureRandom.hex}.#{SecureRandom.hex}" }
   end
 
   factory :bolt_payment_method, class: SolidusBolt::PaymentMethod do

data/lib/solidus_bolt/version.rb

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

data/solidus_bolt.gemspec

@@ -33,8 +33,7 @@ Gem::Specification.new do |spec|
   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'
+  spec.add_dependency 'rails'
   spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
   spec.add_dependency 'solidus_social'
   spec.add_dependency 'solidus_support', '~> 0.5'

data/spec/decorators/models/solidus_bolt/order_decorator_spec.rb

@@ -7,8 +7,10 @@ RSpec.describe SolidusBolt::OrderDecorator do
     it 'returns a hash with line items and price' do
       result = {
         total_amount: (order.total * 100).to_i,
+        tax_amount: (order.tax_total * 100).to_i,
         order_reference: order.number,
         currency: 'USD',
+        shipments: array_including(hash_including(:reference)),
         items: [{
           sku: order.line_items.first.sku,
           name: order.line_items.first.name,
@@ -16,7 +18,8 @@ RSpec.describe SolidusBolt::OrderDecorator do
           quantity: 1
         }]
       }
-      expect(order.bolt_cart).to eq(result)
+
+      expect(order.bolt_cart).to match hash_including(result)
     end
   end
 

data/spec/decorators/models/solidus_bolt/shipment_decorator_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+RSpec.describe SolidusBolt::ShipmentDecorator do
+  describe '#bolt_shipment' do
+    subject(:bolt_shipment) { shipment.bolt_shipment }
+
+    let(:shipment) { create(:shipment, number: 'S000000001') }
+    let(:ship_address) { shipment.order.ship_address }
+
+    it 'is expected' do
+      expect(bolt_shipment).to match hash_including(
+        shipping_address: hash_including(postal_code: ship_address.zipcode, country_code: ship_address.country_iso),
+        reference: 'S000000001',
+        cost: 10_000
+      )
+    end
+  end
+end

data/spec/models/solidus_bolt/bolt_configuration_spec.rb

@@ -5,8 +5,6 @@ RSpec.describe SolidusBolt::BoltConfiguration, type: :model do
     [
       'id',
       'environment',
-      'merchant_public_id',
-      'division_public_id',
       'api_key',
       'signing_secret',
       'publishable_key',
@@ -46,8 +44,6 @@ RSpec.describe SolidusBolt::BoltConfiguration, type: :model do
     it 'is true for a record with empty fields' do
       create(
         :bolt_configuration,
-        merchant_public_id: '',
-        division_public_id: '',
         api_key: '',
         signing_secret: '',
         publishable_key: ''
@@ -61,6 +57,20 @@ RSpec.describe SolidusBolt::BoltConfiguration, type: :model do
     end
   end
 
+  describe '#merchant_public_id' do
+    it 'returns the merchant_public_id' do
+      bolt_configuration = create(:bolt_configuration, publishable_key: 'abc.def.ghi')
+      expect(bolt_configuration.merchant_public_id).to eq('abc')
+    end
+  end
+
+  describe '#division_public_id' do
+    it 'returns the division_public_id' do
+      bolt_configuration = create(:bolt_configuration, publishable_key: 'abc.def.ghi')
+      expect(bolt_configuration.division_public_id).to eq('def')
+    end
+  end
+
   describe '#environment_url' do
     context 'when production envornment' do
       let(:config) { create(:bolt_configuration, environment: 'production') }

data/spec/models/solidus_bolt/payment_method_spec.rb

@@ -18,4 +18,29 @@ RSpec.describe SolidusBolt::PaymentMethod, type: :model do
       expect(described_class.new.partial_name).to eq 'bolt'
     end
   end
+
+  describe '#try_void' do
+    let(:payment) { create(:payment) }
+
+    context 'when the payment can be voided' do
+      subject(:try_void) { described_instance.try_void(payment) }
+
+      let(:described_instance) { described_class.new }
+      let(:response) { ActiveMerchant::Billing::Response.new(true, 'Transaction voided', {}, authorization: '123') }
+
+      before do
+        allow(payment.source).to receive(:can_void?).and_return(true)
+        allow(described_instance.gateway).to receive(:void).and_return(response)
+      end
+
+      it 'calls void on the gateway' do
+        try_void
+
+        expect(described_instance.gateway).to have_received(:void).with(
+          payment.response_code,
+          originator: payment
+        )
+      end
+    end
+  end
 end

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

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

data/spec/services/solidus_bolt/webhooks/create_service_spec.rb

@@ -4,13 +4,15 @@ require 'spec_helper'
 
 RSpec.describe SolidusBolt::Webhooks::CreateService, :vcr, :bolt_configuration do
   describe '#call', vcr: true do
-    subject(:create) { described_class.call(url: 'https://solidus-test.com/webhook', event: event) }
+    subject(:create_service) { described_class.call(url: 'https://solidus-test.com/webhook', event: event) }
+
+    before { SolidusBolt::BoltConfiguration.fetch.update(publishable_key: 'abc.def.ghi') }
 
     context 'with an event' do
       let(:event) { 'payment' }
 
       it 'returns a webhook id' do
-        expect(create).to match hash_including('webhook_id')
+        expect(create_service).to match hash_including('webhook_id')
       end
     end
 
@@ -18,7 +20,7 @@ RSpec.describe SolidusBolt::Webhooks::CreateService, :vcr, :bolt_configuration d
       let(:event) { 'all' }
 
       it 'returns a webhook id' do
-        expect(create).to match hash_including('webhook_id')
+        expect(create_service).to match hash_including('webhook_id')
       end
     end
 
@@ -26,7 +28,7 @@ RSpec.describe SolidusBolt::Webhooks::CreateService, :vcr, :bolt_configuration d
       let(:event) { '' }
 
       it 'raises a server error' do
-        expect{ create }.to raise_error SolidusBolt::ServerError
+        expect{ create_service }.to raise_error SolidusBolt::ServerError
       end
     end
   end

data/spec/support/bolt_configuration.rb

@@ -5,8 +5,6 @@ RSpec.configure do |config|
     solidus_bolt_configuration = SolidusBolt::BoltConfiguration.fetch
 
     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']
     solidus_bolt_configuration.api_key = ENV['BOLT_API_KEY']
     solidus_bolt_configuration.signing_secret = ENV['BOLT_SIGNING_SECRET']
     solidus_bolt_configuration.publishable_key = ENV['BOLT_PUBLISHABLE_KEY']

data/spec/support/vcr.rb

@@ -20,7 +20,6 @@ VCR.configure do |config|
 
   config.filter_sensitive_data('<PUBLISHABLE_KEY>') { SolidusBolt::BoltConfiguration.fetch.publishable_key }
   config.filter_sensitive_data('<API_KEY>') { SolidusBolt::BoltConfiguration.fetch.api_key }
-  config.filter_sensitive_data('<DIVISION_ID>') { SolidusBolt::BoltConfiguration.fetch.division_public_id }
 
   # Let's you set default VCR record mode with VCR_RECORDE_MODE=all for re-recording
   # episodes. :once is VCR default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bolt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - piyushswain
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -84,26 +84,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.a
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.a
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.a
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.a
-- !ruby/object:Gem::Dependency
-  name: solidus_auth_devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -271,6 +251,7 @@ files:
 - app/decorators/models/solidus_bolt/log_entry_decorator.rb
 - app/decorators/models/solidus_bolt/order_decorator.rb
 - app/decorators/models/solidus_bolt/payment_decorator.rb
+- app/decorators/models/solidus_bolt/shipment_decorator.rb
 - app/decorators/omniauth/strategies/bolt_decorator.rb
 - app/jobs/solidus_bolt/add_address_job.rb
 - app/models/solidus_bolt.rb
@@ -335,6 +316,7 @@ files:
 - 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/migrate/20220725133701_remove_merchant_id_and_division_public_id_on_bolt_configuration.rb
 - db/seeds.rb
 - lib/generators/solidus_bolt/install/install_generator.rb
 - lib/generators/solidus_bolt/install/templates/initializer.rb
@@ -349,6 +331,7 @@ files:
 - spec/decorators/models/solidus_bolt/address_decorator_spec.rb
 - spec/decorators/models/solidus_bolt/order_decorator_spec.rb
 - spec/decorators/models/solidus_bolt/payment_decorator_spec.rb
+- spec/decorators/models/solidus_bolt/shipment_decorator_spec.rb
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_AddAddressService/_call/with_correct_access_token/receives_a_successful_response.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_AddAddressService/_call/with_existing_address/skips_the_add_address_call.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_AddAddressService/_call/with_wrong_access_token/gives_an_error.yml
@@ -442,6 +425,7 @@ test_files:
 - spec/decorators/models/solidus_bolt/address_decorator_spec.rb
 - spec/decorators/models/solidus_bolt/order_decorator_spec.rb
 - spec/decorators/models/solidus_bolt/payment_decorator_spec.rb
+- spec/decorators/models/solidus_bolt/shipment_decorator_spec.rb
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_AddAddressService/_call/with_correct_access_token/receives_a_successful_response.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_AddAddressService/_call/with_existing_address/skips_the_add_address_call.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_AddAddressService/_call/with_wrong_access_token/gives_an_error.yml