solidus_bolt 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742875df47de9e63b63e2abb6d986c8e6fda7b1f5298fc49be6e04d06cd5a050
-  data.tar.gz: 8e3f173daca61cb9b03b63ee26d70e06ce0a5462c3803fc9c65150fa1da13cc7
+  metadata.gz: f9f19675a463bcfbccc9fe98a89fc973d5bdfb34d66a57e48ad3882441877863
+  data.tar.gz: d79c693485c474464c5563be4710c7c3898031ef879df7d9cb639d9ea203d195
 SHA512:
-  metadata.gz: a0f3cea501cbc8086af33a9d2871593d4e30e6495807ad2fad05f029711086ec8f2b2d3b6e44149fa838403536129d5a5038347a23a87ff99627a80e3274cd87
-  data.tar.gz: 90901739f3d6cc165309ef2f0528f6f4897ac8598c8434e01322bbae208a5cd58f1154b6a2bddebd57e5b75808010961f3a710eac83f267df38400d6dcbbb248
+  metadata.gz: 6fe90bea4b8ccd2712913f0ac7241a4b00458b066aa90cceda1adab3a6b0bad29fc0136f116b3edbf39d03d3b586cfbf89c9b071e0477fa4ec1f1501a100da42
+  data.tar.gz: 646680ba9a1f2a81337135e242696a759ae04f469d442e3b5241d1c255035443a0a066fc05fe220d16481dbf1314c1a2d1b246a97de7e0db47dd7e7aa0e091c3

data/app/assets/javascripts/solidus_bolt.js

@@ -75,6 +75,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/decorators/models/solidus_bolt/order_decorator.rb

@@ -7,6 +7,7 @@ module SolidusBolt
         total_amount: display_total.cents,
         order_reference: number,
         currency: currency,
+        shipments: bolt_shipments_payload,
         items: line_items.map do |line_item|
           {
             sku: line_item.sku,
@@ -35,6 +36,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/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/db/seeds.rb

@@ -2,7 +2,7 @@
 
 solidus_bolt_configuration = SolidusBolt::BoltConfiguration.fetch
 
-solidus_bolt_configuration.environment = ENV['BOLT_ENVIRONMENT']
+solidus_bolt_configuration.environment = ENV.fetch('BOLT_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']

data/lib/solidus_bolt/version.rb

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

data/solidus_bolt.gemspec

@@ -33,7 +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 'rails'
   spec.add_dependency 'solidus_auth_devise'
   spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
   spec.add_dependency 'solidus_social'

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

@@ -9,6 +9,7 @@ RSpec.describe SolidusBolt::OrderDecorator do
         total_amount: (order.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 +17,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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bolt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.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-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -86,22 +86,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.a
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.a
+        version: '0'
   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
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_auth_devise
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +265,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
@@ -349,6 +344,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 +438,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