active_fulfillment 3.2.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c116080121697527325b266bda808c6acea1be1e
-  data.tar.gz: d49f7f6df9eeaaa9fad7d40a2cd2080f981be35f
+  metadata.gz: a0f9b8104563234cb4c072ac8af4359437c39228
+  data.tar.gz: a2066097da1cac659bf2b8d1be352448ac08ebbb
 SHA512:
-  metadata.gz: 3fbcca254fb6aca6b40371c6ab89a3bc9f07873bcfa61df02c64cc433c3243489f365e6d8a33842576557de1bf8dddfbb573f06268f662751065ff011294801a
-  data.tar.gz: 3f71ad76b4776338811db3787c7e14f8864534662eb9bb2452f8d380fa427a8ad44eb2248328653f75a9acbd010c087b49fe97d19d4ac068c19103fb121d64f4
+  metadata.gz: 3fe27cd0a146e3eb3595851d9d7b7dc22c473a8ae4609a6b2292f1d17e66fdc459f07f298a16d474ed1266ba825d1d51cf4f2d914368bedfad83d57219c64cd1
+  data.tar.gz: e4c6103a6053887a91294de1c8e3269b09a5a2983bc544d0985fb8969c04d02c70648f6f87e8b05bb8431e430467c0860780ab67c0891a77331d64f7daf408a5

data/lib/active_fulfillment/services/amazon_mws.rb

@@ -18,15 +18,37 @@ module ActiveFulfillment
     XML_FAILURE_RESPONSE = { :success => FAILURE }.freeze
 
     ENDPOINTS = {
-      :ca => 'mws.amazonservices.ca',
+      :au => 'mws.amazonservices.com.au',
+      :br => 'mws.amazonservices.com',
+      :ca => 'mws.amazonservices.com',
       :cn => 'mws.amazonservices.com.cn',
-      :de => 'mws-eu.amazonservices.ca',
-      :es => 'mws-eu.amazonservices.ca',
-      :fr => 'mws-eu.amazonservices.ca',
-      :it => 'mws-eu.amazonservices.ca',
+      :de => 'mws-eu.amazonservices.com',
+      :es => 'mws-eu.amazonservices.com',
+      :fr => 'mws-eu.amazonservices.com',
+      :gb => 'mws-eu.amazonservices.com',
+      :in => 'mws.amazonservices.in',
+      :it => 'mws-eu.amazonservices.com',
       :jp => 'mws.amazonservices.jp',
-      :uk => 'mws-eu.amazonservices.ca',
-      :us => 'mws.amazonservices.com'
+      :mx => 'mws.amazonservices.com',
+      :uk => 'mws-eu.amazonservices.com',
+      :us => 'mws.amazonservices.com',
+    }.freeze
+
+    MARKETPLACE_IDS = {
+      :au => 'A39IBJ37TRP1C6',
+      :br => 'A2Q3Y263D00KWC',
+      :ca => 'A2EUQ1WTGCTBG2',
+      :cn => 'AAHKV2X7AFYLW',
+      :de => 'A1PA6795UKMFR9',
+      :es => 'A1RKKUPIHCS9HS',
+      :fr => 'A13V1IB3VIYZZH',
+      :gb => 'A1F83G8C2ARO7P',
+      :in => 'A21TJRUUN4KGV',
+      :it => 'APJ6JRA9NG5V4',
+      :jp => 'A1VC38T7YXB528',
+      :mx => 'A1AM78C64UM0Y8',
+      :uk => 'A1F83G8C2ARO7P',
+      :us => 'ATVPDKIKX0DER',
     }.freeze
 
     LOOKUPS = {
@@ -86,6 +108,10 @@ module ActiveFulfillment
       ENDPOINTS[@options[:endpoint] || :us]
     end
 
+    def marketplace_id
+      MARKETPLACE_IDS[@options[:endpoint] || :us]
+    end
+
     def fulfill(order_id, shipping_address, line_items, options = {})
       requires!(options, :order_date, :shipping_method)
       with_error_handling do
@@ -339,7 +365,8 @@ module ActiveFulfillment
         :SellerFulfillmentOrderId => order_id.to_s,
         :DisplayableOrderId => order_id.to_s,
         :DisplayableOrderDateTime => options[:order_date].utc.iso8601,
-        :ShippingSpeedCategory => options[:shipping_method]
+        :ShippingSpeedCategory => options[:shipping_method],
+        :MarketplaceId => marketplace_id,
       }
       params[:DisplayableOrderComment] = options[:comment] if options[:comment]
 

data/lib/active_fulfillment/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveFulfillment
-  VERSION = "3.2.4"
+  VERSION = "3.2.5"
 end

data/test/unit/services/amazon_mws_test.rb

@@ -78,6 +78,11 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
     assert_equal ActiveFulfillment::AmazonMarketplaceWebService::ENDPOINTS[:jp], service.endpoint
   end
 
+  def test_endpoint_and_marketplace_ids_have_the_same_keys
+    assert_equal ActiveFulfillment::AmazonMarketplaceWebService::ENDPOINTS.keys,
+      ActiveFulfillment::AmazonMarketplaceWebService::MARKETPLACE_IDS.keys
+  end
+
   def test_build_basic_api_query
     options = {
       "Action" => "SubmitFeed",
@@ -247,6 +252,7 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
   def test_successful_fulfillment
     @service.expects(:ssl_post).with do |uri, query, headers|
       assert_equal 'https://mws.amazonservices.com/FulfillmentOutboundShipment/2010-10-01', uri
+      assert_equal 'ATVPDKIKX0DER', CGI.parse(query)['MarketplaceId'].first
     end.returns(successful_fulfillment_response)
     response = @service.fulfill('12345678', @address, @line_items, @options)
     assert response.success?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -199,14 +199,14 @@ specification_version: 4
 summary: Framework and tools for dealing with shipping, tracking and order fulfillment
   services.
 test_files:
-- test/test_helper.rb
-- test/remote/amazon_mws_test.rb
-- test/remote/james_and_james_test.rb
-- test/remote/shipwire_test.rb
-- test/remote/webgistix_test.rb
+- test/unit/base_test.rb
 - test/unit/services/amazon_mws_test.rb
-- test/unit/services/james_and_james_test.rb
+- test/unit/services/webgistix_test.rb
 - test/unit/services/shopify_api_test.rb
 - test/unit/services/shipwire_test.rb
-- test/unit/services/webgistix_test.rb
-- test/unit/base_test.rb
+- test/unit/services/james_and_james_test.rb
+- test/test_helper.rb
+- test/remote/amazon_mws_test.rb
+- test/remote/webgistix_test.rb
+- test/remote/shipwire_test.rb
+- test/remote/james_and_james_test.rb