mollie-api-ruby 4.7.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 199d37cfa91ad1e3132c095248ea54a26e7a25dddb748b02b2fa17b7d58334a3
-  data.tar.gz: 30ad0213bd7ed35038eecac7c48e4c3b965ca56b9f445c2ff6d723d2f223b741
+  metadata.gz: aedb86d7ed96dc6a88685737259c150e3c676b31bf14411eb7f0dac3147c357f
+  data.tar.gz: f7f3745b6575a583621bcb643a5167306d0198a12a076ccabea392c2f4793579
 SHA512:
-  metadata.gz: 3bee04cf11e085a6886ded95949e996f66d78d4a5a5479b96fb6c4d74d8ef588ae2de6040966df27432c147062988370667c0ef601b908feeeca55b7cadb4eb5
-  data.tar.gz: '080873b112c5878455a65faad416ce9e5fa6af4c8acf0f3784986c5a2c8ea52895740c3d55a2fd84dff672ad83031d08b85d7a1a86c1b58aeffe7deaf2d21bb6'
+  metadata.gz: 75e51b046272954999861f8ffa45a0eadce969ee28383d917b7911d9117d72964b8e8cd1e34cff9dcffa3f5f7d7fc51770d23bd5e1be87aa6a739b619f738421
+  data.tar.gz: 65181e4965486b3f61d3a2bdb287daa2967cdf81b6be4813be04f114ef9483941e5e8d295a92141779bfb6b748fe5a910e9717c2b2b1eea8cd2dfbef3310750e

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 4.7.1 - 2020-02-13
+
+  - Fix `Capture#shipment` API call.
+
 ## 4.7.0 - 2020-02-03
 
   - Implemented various API features from the changelog up to and including Tuesday, September 24th, 2019.

data/README.md

@@ -5,9 +5,9 @@
 
 <img src="https://info.mollie.com/hubfs/github/ruby/editor.png" />
 
-> LOOKING FOR VERSION v2.2.X README? [CLICK HERE](https://github.com/mollie/mollie-api-ruby/tree/2.2.x)
+> LOOKING FOR VERSION v2.2.X README? [CLICK HERE](https://github.com/mollie/mollie-api-ruby/tree/v2.2.1)
 
-> LOOKING FOR VERSION v3.1.X README? [CLICK HERE](https://github.com/mollie/mollie-api-ruby/tree/3.1.x)
+> LOOKING FOR VERSION v3.1.X README? [CLICK HERE](https://github.com/mollie/mollie-api-ruby/tree/v3.1.6)
 
 [![Gem Version](https://badge.fury.io/rb/mollie-api-ruby.svg)](https://badge.fury.io/rb/mollie-api-ruby)
 [![](https://travis-ci.org/mollie/mollie-api-ruby.png)](https://travis-ci.org/mollie/mollie-api-ruby)

data/lib/mollie/method.rb

@@ -24,7 +24,8 @@ module Mollie
                   :minimum_amount,
                   :maximum_amount,
                   :image,
-                  :issuers
+                  :issuers,
+                  :pricing
 
     def minimum_amount=(minimum_amount)
       @minimum_amount = Mollie::Amount.new(minimum_amount)
@@ -41,5 +42,16 @@ module Mollie
     def bigger_image
       image['size2x']
     end
+
+    def pricing=(pricing)
+      @pricing = pricing.map do |price|
+        OpenStruct.new(
+          description: price['description'],
+          fixed: Mollie::Amount.new(price['fixed']),
+          variable: price['variable'],
+          fee_region: price['fee_region']
+        )
+      end
+    end
   end
 end

data/lib/mollie/order.rb

@@ -18,6 +18,7 @@ module Mollie
                   :status,
                   :is_cancelable,
                   :billing_address,
+                  :shopper_country_must_match_billing_country,
                   :consumer_date_of_birth,
                   :order_number,
                   :shipping_address,

data/lib/mollie/payment.rb

@@ -31,6 +31,7 @@ module Mollie
                   :method,
                   :metadata,
                   :locale,
+                  :restrict_payment_methods_to_country,
                   :country_code,
                   :profile_id,
                   :settlement_amount,

data/lib/mollie/payment/capture.rb

@@ -30,8 +30,9 @@ module Mollie
       end
 
       def shipment(options = {})
-        return if shipment_id.nil?
-        Order::Shipment.get(shipment_id, options)
+        resource_url = Util.extract_url(links, 'shipment')
+        response = Client.instance.perform_http_call('GET', resource_url, nil, {}, options)
+        Order::Shipment.new(response)
       end
 
       def settlement(options = {})

data/lib/mollie/version.rb

@@ -1,3 +1,3 @@
 module Mollie
-  VERSION = '4.7.0'.freeze
+  VERSION = '4.7.1'.freeze
 end

data/test/fixtures/methods/get-includes-pricing.json

@@ -0,0 +1,57 @@
+{
+  "resource": "method",
+  "id": "creditcard",
+  "description": "Credit card",
+  "minimumAmount": {
+    "value": "0.01",
+    "currency": "EUR"
+  },
+  "maximumAmount": {
+    "value": "2000.00",
+    "currency": "EUR"
+  },
+  "image": {
+    "size1x": "https://www.mollie.com/external/icons/payment-methods/creditcard.png",
+    "size2x": "https://www.mollie.com/external/icons/payment-methods/creditcard%402x.png",
+    "svg": "https://www.mollie.com/external/icons/payment-methods/creditcard.svg"
+  },
+  "pricing": [
+    {
+      "description": "Commercial & non-European cards",
+      "fixed": {
+        "value": "0.25",
+        "currency": "EUR"
+      },
+      "variable": "2.8",
+      "feeRegion": "other"
+    },
+    {
+      "description": "European cards",
+      "fixed": {
+        "value": "0.25",
+        "currency": "EUR"
+      },
+      "variable": "1.8",
+      "feeRegion": "eu-cards"
+    },
+    {
+      "description": "Maestro",
+      "fixed": {
+        "value": "0.39",
+        "currency": "EUR"
+      },
+      "variable": "0",
+      "feeRegion": "maestro"
+    }
+  ],
+  "_links": {
+    "self": {
+      "href": "https://api.mollie.com/v2/methods/creditcard?include=pricing",
+      "type": "application/hal+json"
+    },
+    "documentation": {
+      "href": "https://docs.mollie.com/reference/v2/methods-api/get-method",
+      "type": "text/html"
+    }
+  }
+}

data/test/fixtures/orders/get.json

@@ -35,6 +35,8 @@
         "familyName": "Skywalker",
         "email": "luke@skywalker.com"
     },
+    "shopperCountryMustMatchBillingCountry": false,
+    "consumerDateOfBirth": "1993-10-21",
     "orderNumber": "18475",
     "shippingAddress": {
         "organizationName": "Mollie B.V.",

data/test/fixtures/payments/get.json

@@ -0,0 +1,39 @@
+{
+    "resource": "payment",
+    "id": "tr_WDqYK6vllg",
+    "mode": "test",
+    "createdAt": "2018-03-20T13:13:37+00:00",
+    "amount": {
+        "value": "10.00",
+        "currency": "EUR"
+    },
+    "description": "Order #12345",
+    "method": null,
+    "metadata": {
+        "order_id": "12345"
+    },
+    "status": "open",
+    "isCancelable": false,
+    "locale": "nl_NL",
+    "restrictPaymentMethodsToCountry": "NL",
+    "expiresAt": "2018-03-20T13:28:37+00:00",
+    "details": null,
+    "profileId": "pfl_QkEhN94Ba",
+    "sequenceType": "oneoff",
+    "redirectUrl": "https://webshop.example.org/order/12345/",
+    "webhookUrl": "https://webshop.example.org/payments/webhook/",
+    "_links": {
+        "self": {
+            "href": "https://api.mollie.com/v2/payments/tr_WDqYK6vllg",
+            "type": "application/hal+json"
+        },
+        "checkout": {
+            "href": "https://www.mollie.com/payscreen/select-method/WDqYK6vllg",
+            "type": "text/html"
+        },
+        "documentation": {
+            "href": "https://docs.mollie.com/reference/v2/payments-api/get-payment",
+            "type": "text/html"
+        }
+    }
+}

data/test/mollie/method_test.rb

@@ -27,5 +27,20 @@ module Mollie
       assert_equal 'https://www.mollie.com/external/icons/payment-methods/creditcard%402x.png', method.bigger_image
       assert_equal 'https://www.mollie.com/external/icons/payment-methods/creditcard.svg', method.image['svg']
     end
+
+    def test_pricing
+      stub_request(:get, 'https://api.mollie.com/v2/methods/creditcard?include=pricing')
+        .to_return(status: 200, body: read_fixture('methods/get-includes-pricing.json'), headers: {})
+
+      creditcard = Method.get('creditcard', include: 'pricing')
+      creditcard_pricing = creditcard.pricing
+
+      assert_equal 3, creditcard_pricing.size
+      assert_equal 'Commercial & non-European cards', creditcard_pricing.first.description
+      assert_equal BigDecimal('0.25'), creditcard_pricing.first.fixed.value
+      assert_equal 'EUR', creditcard_pricing.first.fixed.currency
+      assert_equal '2.8', creditcard_pricing.first.variable
+      assert_equal 'other', creditcard_pricing.first.fee_region
+    end
   end
 end

data/test/mollie/order_test.rb

@@ -65,6 +65,8 @@ module Mollie
       assert_equal 'EUR', order.amount_refunded.currency
       assert_equal 'created', order.status
       assert_equal true, order.is_cancelable
+      assert_equal false, order.shopper_country_must_match_billing_country
+      assert_equal '1993-10-21', order.consumer_date_of_birth
       assert_equal '18475', order.order_number
       assert_equal 'nl_NL', order.locale
       assert_equal '1337', order.metadata.order_id

data/test/mollie/payment/capture_test.rb

@@ -53,7 +53,7 @@ module Mollie
         stub_request(:get, 'https://api.mollie.com/v2/payments/tr_WDqYK6vllg/captures/cpt_4qqhO89gsT')
           .to_return(status: 200, body: GET_CAPTURE, headers: {})
 
-        stub_request(:get, 'https://api.mollie.com/v2/shipments/shp_3wmsgCJN4U')
+        stub_request(:get, 'https://api.mollie.com/v2/orders/ord_8wmqcHMN4U/shipments/shp_3wmsgCJN4U')
           .to_return(status: 200, body: SHIPMENT_STUB, headers: {})
 
         capture = Payment::Capture.get('cpt_4qqhO89gsT', payment_id: 'tr_WDqYK6vllg')

data/test/mollie/payment_test.rb

@@ -223,6 +223,14 @@ module Mollie
       assert_equal 'EUR', payment.application_fee.amount.currency
     end
 
+    def test_restrict_payment_methods_to_country
+      stub_request(:get, 'https://api.mollie.com/v2/payments/tr_WDqYK6vllg')
+        .to_return(status: 200, body: read_fixture('payments/get.json'), headers: {})
+
+      payment = Payment.get('tr_WDqYK6vllg')
+      assert_equal 'NL', payment.restrict_payment_methods_to_country
+    end
+
     def test_list_refunds
       stub_request(:get, 'https://api.mollie.com/v2/payments/pay-id/refunds')
         .to_return(status: 200, body: %({"_embedded" : {"refunds" : [{"id":"ref-id", "payment_id":"pay-id"}]}}), headers: {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mollie-api-ruby
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.1
 platform: ruby
 authors:
 - Mollie B.V.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -212,6 +212,7 @@ files:
 - mollie-api-ruby.gemspec
 - test/fixtures/captures/get.json
 - test/fixtures/captures/list.json
+- test/fixtures/methods/get-includes-pricing.json
 - test/fixtures/onboarding/me.json
 - test/fixtures/onboarding/submit.json
 - test/fixtures/orders/cancel_line.json
@@ -224,6 +225,7 @@ files:
 - test/fixtures/orders/refund.json
 - test/fixtures/orders/refund_all.json
 - test/fixtures/orders/update.json
+- test/fixtures/payments/get.json
 - test/fixtures/refunds/get.json
 - test/fixtures/shipments/create.json
 - test/fixtures/shipments/get.json
@@ -296,6 +298,8 @@ test_files:
 - test/fixtures/shipments/create.json
 - test/fixtures/shipments/update.json
 - test/fixtures/shipments/list.json
+- test/fixtures/payments/get.json
+- test/fixtures/methods/get-includes-pricing.json
 - test/fixtures/refunds/get.json
 - test/fixtures/orders/get.json
 - test/fixtures/orders/create_refund.json