zaikio-procurement 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b4e2a41d312bf1c6a430d1c527182bb86fc53cb2b95e6629d1a593af2dec099
-  data.tar.gz: 212e0b722072eed7b0caa5b70d2dcf6e881c7682c7a47cda12f982be9703c02f
+  metadata.gz: 6025b3ec71f3a51029df00184334cd3f90b46c777068d08092eebdcbfae5b047
+  data.tar.gz: 585fc195103c24cd304b39a80fdb78996c2cdaecbaf1cfa66138f71261a59f85
 SHA512:
-  metadata.gz: f894250c1f410743a77e4af7834797b08d20450960bb932772e7824c2fc74b2d78f4a64a02a9db6524759279ef756e4b48043293ea14c2280a462c8cecb8882e
-  data.tar.gz: 9a16adffdbf68fd6fc30937a639d8c9d3d69b712b453c65e24b811835a90f6b900f9562668f1a714fd75963e1dce6a29549c56ab9b74cd3ccab4b7c64c8016f6
+  metadata.gz: e2339466d3af3150f3c67f4e40f434b374801c2704f985a31bda16a7a2bd2fdf72730405dfe35b05a94fbb87e7920c670701abee502d328ce524652b7c62bd17
+  data.tar.gz: 6ed25c344a83987e01a3472fc79ac03252d8b936efb55786e02fa48c9b7210897001de27a1c34cb35f76669cb5371d37c853cd949988a7df597398600c840063

data/README.md

@@ -68,6 +68,11 @@ Zaikio::Procurement.with_token(token) do
   variant = Zaikio::Procurement::Variant.find("845a4d7e-db5a-46a6-9d30-bf2e884cb393")
   variant.line_item_suggestion(amount: 10, unit: "sheet") # Returns a line item suggestion for a specifc variant
 
+  # in Supplier API one must provide a valid scope when using `Variant` or `Article`:
+  # https://docs.zaikio.com/api/procurement_suppliers/procurement.html#/Variants/get__article_type__variants__variant_id_
+  variant = Zaikio::Procurement::Variant.substrate.find("845a4d7e-db5a-46a6-9d30-bf2e884cb393")
+  variant.skus
+  
   # https://docs.zaikio.com/api/procurement_consumers/procurement.html#/LineItemSuggestions/post_suppliers__supplier_id__line_item_suggestions
   supplier = Zaikio::Procurement::Supplier.find("b5b14aa0-ae84-452b-9719-a38545365902")
   supplier.line_item_suggestions(
@@ -137,4 +142,4 @@ Zaikio::Directory.with_token(token) do
   Zaikio::Procurement::Article.with_fallback.find("7cbf51bd-35a8-47a1-84a2-57aa63140234") # => nil
   Zaikio::Procurement::Article.with_fallback.all # Automatically uses empty array as fallback
 end
-```
+```

data/lib/zaikio/procurement/address.rb

@@ -0,0 +1,22 @@
+module Zaikio
+  module Procurement
+    class Address < Base
+      attributes :addition,
+                 :addressable,
+                 :addressee,
+                 :country_code,
+                 :county,
+                 :kind,
+                 :location,
+                 :number,
+                 :state,
+                 :street,
+                 :text,
+                 :town,
+                 :types,
+                 :zip_code,
+                 :created_at,
+                 :updated_at
+    end
+  end
+end

data/lib/zaikio/procurement/article.rb

@@ -1,13 +1,16 @@
+require_relative "concern/article_type_scoped"
+
 module Zaikio
   module Procurement
     class Article < Base
+      include ArticleTypeScoped
       include_root_in_json :article
 
       # Class methods
       class << self
         # Spyke URI override
         def uri
-          Zaikio::Procurement.configuration.flavor == :supplier ? "substrate/articles(/:id)" : "articles(/:id)"
+          Zaikio::Procurement.configuration.flavor == :supplier ? ":type/articles(/:id)" : "articles(/:id)"
         end
 
         def list_by_article_type_or_supplier_slug(type_or_slug)
@@ -24,8 +27,8 @@ module Zaikio
                  :kind, :supplier_id, :created_at, :updated_at
 
       # Associations
-      has_one :supplier,  class_name: "Zaikio::Procurement::Supplier",
-                          uri: nil
+      has_one :supplier, class_name: "Zaikio::Procurement::Supplier",
+                         uri: nil
       # Manually build variants association to work for consumers and suppliers
       def variants
         self.class.request(:get, "#{uri}/variants").data.collect { |v| Zaikio::Procurement::Variant.new(v) }

data/lib/zaikio/procurement/concern/article_type_scoped.rb

@@ -0,0 +1,21 @@
+module Zaikio
+  module Procurement
+    module ArticleTypeScoped
+      extend ActiveSupport::Concern
+      included do
+        scope :substrate, -> { where(type: :substrate) }
+        scope :plate, -> { where(type: :plate) }
+      end
+      module ClassMethods
+        def find(id)
+          if Zaikio::Procurement.configuration.flavor == :supplier &&
+             (current_scope.nil? || current_scope.params[:type].blank?)
+            raise ArgumentError, "id and type are required for #{name.demodulize} in Supplier API"
+          end
+
+          super
+        end
+      end
+    end
+  end
+end

data/lib/zaikio/procurement/delivery.rb

@@ -6,11 +6,12 @@ module Zaikio
 
       # Attributes
       attributes :confirmed_delivery_date, :desired_delivery_date, :references,
-                 :address, :order_id, :created_at, :updated_at
+                 :order_id, :created_at, :updated_at
 
       # Associations
-      belongs_to :order,             class_name: "Zaikio::Procurement::Order",
-                                     uri: nil
+      belongs_to :address,           class_name: "Zaikio::Procurement::Address", uri: nil
+      belongs_to :order,             class_name: "Zaikio::Procurement::Order", uri: nil
+
       has_many :delivery_line_items, class_name: "Zaikio::Procurement::DeliveryLineItem",
                                      uri: "deliveries/:delivery_id/delivery_line_items(/:id)"
     end

data/lib/zaikio/procurement/order_conditions_inquiry.rb

@@ -0,0 +1,15 @@
+module Zaikio
+  module Procurement
+    class OrderConditionsInquiry < Base
+      uri "order_conditions_inquiries(/:id)"
+      include_root_in_json :order_conditions_inquiry
+
+      # Attributes
+      attributes :contract_id, :currency, :created_at, :updated_at,
+                 :desired_delivery_date, :verified_at, :expires_at,
+                 :verified_net_handling_fee, :verified_net_shipping_fee,
+                 :verified_net_total, :verified_delivery_date, :order_line_items,
+                 :verified_order_line_items
+    end
+  end
+end

data/lib/zaikio/procurement/sku.rb

@@ -15,13 +15,9 @@ module Zaikio
 
       # Manually build variant association to work for consumers and suppliers
       def variant
-        path = if Zaikio::Procurement.configuration.flavor == :supplier
-                 "substrate/variants/#{variant_id}"
-               else
-                 "variants/#{variant_id}"
-               end
-
-        Zaikio::Procurement::Variant.new(self.class.request(:get, path).data)
+        Zaikio::Procurement::Variant.new(
+          self.class.request(:get, attributes.dig("variant", "links", 0, "href")).data
+        )
       end
     end
   end

data/lib/zaikio/procurement/variant.rb

@@ -1,11 +1,14 @@
+require_relative "concern/article_type_scoped"
+
 module Zaikio
   module Procurement
     class Variant < Base
+      include ArticleTypeScoped
       include_root_in_json :variant
 
       # Spyke URI override
       def self.uri
-        Zaikio::Procurement.configuration.flavor == :supplier ? "substrate/variants(/:id)" : "variants(/:id)"
+        Zaikio::Procurement.configuration.flavor == :supplier ? ":type/variants(/:id)" : "variants(/:id)"
       end
 
       # Attributes
@@ -16,8 +19,8 @@ module Zaikio
       # Associations
       has_one :article, class_name: "Zaikio::Procurement::Article",
                         uri: nil
-      has_many :skus,   class_name: "Zaikio::Procurement::Sku",
-                        uri: "variants/:variant_id/skus"
+      has_many :skus, class_name: "Zaikio::Procurement::Sku",
+                      uri: "variants/:variant_id/skus"
 
       def line_item_suggestion(**attributes)
         self.class.request(

data/lib/zaikio/procurement/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module Procurement
-    VERSION = "0.2.2".freeze
+    VERSION = "0.4.0".freeze
   end
 end

data/lib/zaikio/procurement.rb

@@ -6,6 +6,7 @@ require "zaikio/procurement/authorization_middleware"
 
 # Models
 require "zaikio/procurement/base"
+require "zaikio/procurement/address"
 require "zaikio/procurement/article"
 require "zaikio/procurement/variant"
 require "zaikio/procurement/substrate_search"
@@ -23,6 +24,7 @@ require "zaikio/procurement/delivery_line_item"
 require "zaikio/procurement/current_supplier"
 require "zaikio/procurement/material_requirement"
 require "zaikio/procurement/material_availability_check"
+require "zaikio/procurement/order_conditions_inquiry"
 
 module Zaikio
   module Procurement

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-procurement
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Zaikio GmbH
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -106,9 +106,11 @@ files:
 - README.md
 - Rakefile
 - lib/zaikio/procurement.rb
+- lib/zaikio/procurement/address.rb
 - lib/zaikio/procurement/article.rb
 - lib/zaikio/procurement/authorization_middleware.rb
 - lib/zaikio/procurement/base.rb
+- lib/zaikio/procurement/concern/article_type_scoped.rb
 - lib/zaikio/procurement/configuration.rb
 - lib/zaikio/procurement/contract.rb
 - lib/zaikio/procurement/contract_request.rb
@@ -119,6 +121,7 @@ files:
 - lib/zaikio/procurement/material_availability_check.rb
 - lib/zaikio/procurement/material_requirement.rb
 - lib/zaikio/procurement/order.rb
+- lib/zaikio/procurement/order_conditions_inquiry.rb
 - lib/zaikio/procurement/order_line_item.rb
 - lib/zaikio/procurement/price.rb
 - lib/zaikio/procurement/sales_group.rb
@@ -149,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Ruby API Client for Zaikio's Procurement Platform