erp_integration 0.3.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b64aeb4d27d23459820866bdac9a989d461f745abfb3790a0bd7b4a2a384c637
-  data.tar.gz: 4affdf46ec9cdffd57027f0e97d8e226bcc9d82c8b382b80c7bdf26e0fbc5a69
+  metadata.gz: 86d28936152c0532ae9dd25cd52d40c8d66dca44eccd4323fb230c8f97d204e8
+  data.tar.gz: 223e971efbe294909519af5c6ae1a5a8590a7c189b30e7de06a27de40e118e4b
 SHA512:
-  metadata.gz: c76fa52a52650b0d3510ecb758545fd17cd9b7ccfc7b2371172498f2c9c93a9112078391d540416183474cccb2d62adee45513ced1f60bca130c91f01373730f
-  data.tar.gz: aacd6f248f1045e8cc68bffb07152d877cc0a2bf203ad08d2cc99e1e021a91510638cfd0e0a0ad47f9bf2aa40dfc59da0bc6dfe80b784745d38b6e4c414780c5
+  metadata.gz: 607e179b5d3e2c1eef9b8dc00b6b8a290412b5e58843570b627dcc6f428c057e84c7a7916d0b1b72df5aae0eadda8effec1bf51f6a5b0abf4e9141a8be508a61
+  data.tar.gz: 4814277a9b1df732e3c31ff72c066d4b6becebd02917328ab04404d060757c3d2fa89055c5a138c1226d9911933377862a2534ce9d28f6ecbe04d9e0aba999b7

data/README.md

@@ -37,15 +37,15 @@ end
 After configuring the gem, one can easily query all the available ERP resources from the connected third-parties.
 
 ```ruby
-$ ErpIntegration::Order.where(reference: 'MT1000SKX')
-=> #<ErpIntegration::Fulfil::Collection @items=[<ErpIntegration::Order @id=100 />] />
+$ ErpIntegration::SalesOrder.where(reference: 'MT1000SKX')
+=> #<ErpIntegration::Fulfil::Collection @items=[<ErpIntegration::SalesOrder @id=100 />] />
 ```
 
 By default, only the `id` will be added to the found ERP resources. However, one can use the `select` method to include more fields.
 
 ```ruby
-$ ErpIntegration::Order.select(:id, :reference).where(reference: 'MT1000SKX')
-=> #<ErpIntegration::Fulfil::Collection @items=[<ErpIntegration::Order @id=100 @reference=MT1000SKX />] />
+$ ErpIntegration::SalesOrder.select(:id, :reference).where(reference: 'MT1000SKX')
+=> #<ErpIntegration::Fulfil::Collection @items=[<ErpIntegration::SalesOrder @id=100 @reference=MT1000SKX />] />
 ```
 
 There are also other type of `where` queries available:

data/bin/prerelease

@@ -17,4 +17,4 @@ git push origin "release_v.$VERSION"
 
 # Tag the new gem version.
 git tag v$VERSION
-git push --tags
+git push origin v$VERSION

data/erp_integration.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 
   # Faraday is a HTTP/REST API client library to interact with third-party API vendors
   spec.add_dependency 'faraday', '>= 0.17.3', '< 1.9.0'
-  spec.add_dependency 'faraday_middleware', '~> 0.14.0'
+  spec.add_dependency 'faraday_middleware', '>= 0.14', '< 1.3'
 
   # Development dependencies
   spec.add_development_dependency 'byebug', '~> 11.0'

data/lib/erp_integration/configuration.rb

@@ -22,15 +22,10 @@ module ErpIntegration
     # @return [String] The merchant ID for Fulfil.
     attr_accessor :fulfil_merchant_id
 
-    # Allows configuring an adapter for the `Order` resource. When none is
+    # Allows configuring an adapter for the `Product` resource. When none is
     # configured, it will default to Fulfil.
-    # @return [Symbol] The configured adapter for the orders
-    attr_writer :order_adapter
-
-    # Allows configuring an adapter for the `OrderLine` resource. When none is
-    # configured, it will default to Fulfil.
-    # @return [Symbol] The configured adapter for the order lines.
-    attr_writer :order_line_adapter
+    # @return [Symbol] The configured adapter for the products.
+    attr_writer :product_adapter
 
     # Allows configuring an adapter for the `PurchaseOrder` resource. When none is
     # configured, it will default to Fulfil.
@@ -47,18 +42,34 @@ module ErpIntegration
     # @return [Symbol] The configured adapter for the purchase request.
     attr_writer :purchase_request_adapter
 
+    # Allows configuring an adapter for the `SalesOrder` resource. When none is
+    # configured, it will default to Fulfil.
+    # @return [Symbol] The configured adapter for the sales orders
+    attr_writer :sales_order_adapter
+
+    # Allows configuring an adapter for the `SalesOrderLine` resource. When none is
+    # configured, it will default to Fulfil.
+    # @return [Symbol] The configured adapter for the order lines.
+    attr_writer :sales_order_line_adapter
+
+    # Allows configuring an adapter for the `SupplierShipment` resource. When
+    # none is configured, it will default to Fulfil.
+    # @return [Symbol] The configured adapter for the supplier shipment.
+    attr_writer :supplier_shipment_adapter
+
+    # Allows configuring an adapter for the `StockMove` resource. When
+    # none is configured, it will default to Fulfil.
+    # @return [Symbol] The configured adapter for the stock move.
+    attr_writer :stock_move_adapter
+
     def initialize(**options)
       options.each_pair do |key, value|
         public_send("#{key}=", value) if respond_to?("#{key}=")
       end
     end
 
-    def order_adapter
-      @order_adapter || :fulfil
-    end
-
-    def order_line_adapter
-      @order_line_adapter || :fulfil
+    def product_adapter
+      @product_adapter || :fulfil
     end
 
     def purchase_order_adapter
@@ -72,6 +83,22 @@ module ErpIntegration
     def purchase_request_adapter
       @purchase_request_adapter || :fulfil
     end
+
+    def sales_order_line_adapter
+      @sales_order_line_adapter || :fulfil
+    end
+
+    def sales_order_adapter
+      @sales_order_adapter || :fulfil
+    end
+
+    def supplier_shipment_adapter
+      @supplier_shipment_adapter || :fulfil
+    end
+
+    def stock_move_adapter
+      @stock_move_adapter || :fulfil
+    end
   end
 
   # Returns ERP Integration's configuration.

data/lib/erp_integration/fulfil/query_methods.rb

@@ -13,14 +13,14 @@ module ErpIntegration
       # selecting multiple fields at once.
       #
       # @example
-      #   $ ErpIntegration::Order.select(:id, :name, 'product.name')
+      #   $ ErpIntegration::SalesOrder.select(:id, :name, 'product.name')
       #   # => <ErpIntegration::Fulfil::Resources::Order @selected_fields=[:id, :name, "product.name"] />
       #
       # When one calls the `all` method, it will fetch all the resources from Fulfil
       # and it will return all the given fields (if available).
       #
       # @example
-      #   $ ErpIntegration::Order.select(:id, :name, 'product.name').all
+      #   $ ErpIntegration::SalesOrder.select(:id, :name, 'product.name').all
       #   # => <ErpIntegration::Fulfil::Collection @items=[...] />
       #
       # Both a list of Strings, Symbols or a combination of these can be passed
@@ -41,8 +41,8 @@ module ErpIntegration
       # to query resources in Fulfil.
       #
       # @example
-      #   $ ErpIntegration::Order.where(id: 100).all
-      #   # => <ErpIntegration::Fulfil::Collection @items=[<ErpIntegration::Order @id=100 />] />
+      #   $ ErpIntegration::SalesOrder.where(id: 100).all
+      #   # => <ErpIntegration::Fulfil::Collection @items=[<ErpIntegration::SalesOrder @id=100 />] />
       #
       # If one adds the `comparison_operator` key to the arguments, it will use
       # that comparison operator to build the query to Fulfil.
@@ -74,10 +74,26 @@ module ErpIntegration
         where(args.merge(comparison_operator: 'in'))
       end
 
+      def where_less_than(args)
+        where(args.merge(comparison_operator: '<'))
+      end
+
+      def where_less_or_equal_to(args)
+        where(args.merge(comparison_operator: '<='))
+      end
+
       def where_like(args)
         where(args.merge(comparison_operator: 'like'))
       end
 
+      def where_more_than(args)
+        where(args.merge(comparison_operator: '>'))
+      end
+
+      def where_more_or_equal_to(args)
+        where(args.merge(comparison_operator: '>='))
+      end
+
       def where_not(args)
         where(args.merge(comparison_operator: '!='))
       end

data/lib/erp_integration/fulfil/resources/product.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative '../api_resource'
+
+module ErpIntegration
+  module Fulfil
+    module Resources
+      class Product < ApiResource
+        self.model_name = 'product.product'
+
+        # Checks whether a certain product is a BOM.
+        # @param sku [String] The product's SKU.
+        # @return [Boolean] Whether it's a BOM or not.
+        def bom?(sku)
+          select(:boms).where(code: sku).first.boms.any?
+        end
+        alias billing_of_materials? bom?
+      end
+    end
+  end
+end

data/lib/erp_integration/fulfil/resources/{order.rb → sales_order.rb}

@@ -5,7 +5,7 @@ require_relative '../api_resource'
 module ErpIntegration
   module Fulfil
     module Resources
-      class Order < ApiResource
+      class SalesOrder < ApiResource
         self.model_name = 'sale.sale'
 
         # Allows cancelling the entire sales order in Fulfil.
@@ -22,6 +22,11 @@ module ErpIntegration
         # https://developers.fulfil.io/rest_api/model/sale.sale/#cancel-a-sales-order
         rescue ErpIntegration::HttpError::BadRequest
           false
+        # Workaround: Fulfil api does not return a json when status code is 200 (a.k.a. "Ok")
+        # and faraday is having an error when trying to parse it. Let's skip the parse error
+        # and move on.
+        rescue Faraday::ParsingError
+          true
         end
       end
     end

data/lib/erp_integration/fulfil/resources/{order_line.rb → sales_order_line.rb}

@@ -5,7 +5,7 @@ require_relative '../api_resource'
 module ErpIntegration
   module Fulfil
     module Resources
-      class OrderLine < ApiResource
+      class SalesOrderLine < ApiResource
         self.model_name = 'sale.line'
       end
     end

data/lib/erp_integration/fulfil/resources/stock_move.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative '../api_resource'
+
+module ErpIntegration
+  module Fulfil
+    module Resources
+      class StockMove < ApiResource
+        self.model_name = 'stock.move'
+      end
+    end
+  end
+end

data/lib/erp_integration/fulfil/resources/supplier_shipment.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative '../api_resource'
+
+module ErpIntegration
+  module Fulfil
+    module Resources
+      class SupplierShipment < ApiResource
+        self.model_name = 'stock.shipment.in'
+      end
+    end
+  end
+end

data/lib/erp_integration/fulfil/where_clause.rb

@@ -18,7 +18,7 @@ module ErpIntegration
     #   # => <WhereClause @key="id" value="100" comparison_operator="=" />
     class WhereClause
       COMPARISON_OPERATORS = [
-        '=', '!=', '<', '<=', '=>', '>', 'like', 'ilike', 'in', 'not in'
+        '=', '!=', '<', '<=', '>=', '>', 'like', 'ilike', 'in', 'not in'
       ].freeze
 
       DEFAULT_COMPARISON_OPERATOR = '='
@@ -26,7 +26,7 @@ module ErpIntegration
       def initialize(key:, value:, comparison_operator: DEFAULT_COMPARISON_OPERATOR)
         @comparison_operator = verify_comparison_operator(comparison_operator)
         @key = key.to_s
-        @value = value.to_s
+        @value = value
       end
 
       # Transforms the `WhereClause` into a filter object for Fulfil.

data/lib/erp_integration/product.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ErpIntegration
+  # The `ErpIntegration::Product` exposes an uniformed API for interaction with
+  # third-party ERP vendors.
+  class Product < Resource
+    attr_accessor :id, :code, :cost_price, :cost_price_method, :quantity_available,
+                  :quantity_buildable, :quantity_inbound, :quantity_on_hand, :salable,
+                  :template, :variant_name, :abc_classification, :account_category,
+                  :account_cogs_used, :account_expense_used, :account_revenue_used,
+                  :account_stock_lost_found_used, :account_stock_production_used,
+                  :account_stock_supplier_used, :account_stock_used, :active,
+                  :asin, :attachments, :attribute_set, :attributes, :attributes_json,
+                  :average_daily_consumed, :average_daily_sales, :average_monthly_consumed,
+                  :average_monthly_sales, :average_price, :boms, :box_type, :brand, :channel_listings,
+                  :consumable, :country_of_origin, :create_date, :create_uid, :customs_description,
+                  :customs_value, :days_of_inventory_left, :default_uom, :default_uom_category,
+                  :description, :dimensions_uom, :ean, :fulfil_strategy, :gc_max, :gc_min,
+                  :gift_card_delivery_mode, :gift_card_prices, :google_product_category,
+                  :gross_margin, :gross_profit, :height, :hs_code, :is_gift_card, :landed_cost,
+                  :lead_time_in_days, :length, :list_price, :long_description, :metadata,
+                  :next_shipping_date, :product_suppliers, :purchasable, :purchase_uom,
+                  :quantity_on_confirmed_purchase_orders, :quantity_outbound, :quantity_returned,
+                  :quantity_sold, :quantity_waiting_consumption, :quantity_wip, :safety_stock_days,
+                  :sale_uom, :scan_required, :ship_from_stock_if_available, :type,
+                  :upc, :use_name_as_customs_description, :weight, :weight_uom,
+                  :width, :write_date, :write_uid
+  end
+end

data/lib/erp_integration/resource.rb

@@ -16,8 +16,8 @@ module ErpIntegration
   #     config.order_adapter = :fulfil
   #   end
   #
-  #   $ ErpIntegration::Order.adapter
-  #   => #<ErpIntegration::Orders::FulfilOrder />
+  #   $ ErpIntegration::SalesOrder.adapter
+  #   => #<ErpIntegration::SalesOrders::FulfilOrder />
   #
   # To add a new resource, follow these steps:
   #   1. Add a new `attr_writer` in the `ErpIntegration::Configuration` class.

data/lib/erp_integration/{order.rb → sales_order.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module ErpIntegration
-  # The `ErpIntegration::Order` exposes an uniformed API for interaction with
+  # The `ErpIntegration::SalesOrder` exposes an uniformed API for interaction with
   # third-party ERP vendors.
-  class Order < Resource
+  class SalesOrder < Resource
     attr_accessor :id, :channel, :number, :party, :sale_date, :shipment_address,
                   :amount_invoiced, :attachments, :carrier, :carrier_service,
                   :channel_identifier, :comment, :company, :confirmation_time,
@@ -15,5 +15,9 @@ module ErpIntegration
                   :tax_amount, :total_amount, :total_quantity, :total_shipment_cost,
                   :untaxed_amount, :warehouse, :weight, :weight_uom, :write_date,
                   :write_uid
+
+    def cancel
+      self.class.adapter.cancel(id)
+    end
   end
 end

data/lib/erp_integration/{order_line.rb → sales_order_line.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module ErpIntegration
-  # The `ErpIntegration::OrderLine` exposes an uniformed API for interaction with
+  # The `ErpIntegration::SalesOrderLine` exposes an uniformed API for interaction with
   # third-party ERP vendors.
-  class OrderLine < Resource
+  class SalesOrderLine < Resource
     attr_accessor :id, :product, :quantity, :unit, :unit_price, :amount, :attachments,
                   :channel_identifier, :create_date, :create_uid, :delivery_address,
                   :delivery_date, :delivery_mode, :description, :discount, :gift_message,

data/lib/erp_integration/stock_move.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module ErpIntegration
+  class StockMove < Resource
+    attr_accessor :attachments, :children, :company, :cost_price, :create_date,
+                  :create_uid, :currency, :effective_date, :from_location,
+                  :from_sublocation, :id, :internal_quantity, :journal_entry,
+                  :metadata, :planned_date, :quantity, :quantity_available,
+                  :reference, :shipment, :state, :to_location, :unit_price, :uom,
+                  :write_date, :write_uid
+  end
+end

data/lib/erp_integration/supplier_shipment.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ErpIntegration
+  class SupplierShipment < Resource
+    attr_accessor :acknowledged_by_3pl_at, :attachments, :carrier, :carrier_service,
+                  :company, :contact_address, :cost, :cost_currency, :create_date,
+                  :create_uidcustomer_shipments, :effective_date, :id, :incoming_moves,
+                  :inventory_moves, :metadata, :moves, :number, :packages, :planned_date,
+                  :reference, :sent_to_3pl_at, :shipping_instructions, :shipping_manifest,
+                  :sscc_code, :state, :supplier, :supplier_location, :total_quantity,
+                  :tpl_status, :tracking_number, :warehouse, :weight, :weight_uom,
+                  :write_date, :write_uid
+  end
+end

data/lib/erp_integration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ErpIntegration
-  VERSION = '0.3.2'
+  VERSION = '0.5.1'
 end

data/lib/erp_integration.rb

@@ -20,10 +20,13 @@ require_relative 'erp_integration/fulfil/client'
 # The `ErpIntegration` integrates Mejuri with third-party ERP vendors.
 module ErpIntegration
   # Resources
-  autoload :Resource, 'erp_integration/resource'
-  autoload :Order, 'erp_integration/order'
-  autoload :OrderLine, 'erp_integration/order_line'
+  autoload :Product, 'erp_integration/product'
   autoload :PurchaseOrder, 'erp_integration/purchase_order'
   autoload :PurchaseOrderLine, 'erp_integration/purchase_order_line'
   autoload :PurchaseRequest, 'erp_integration/purchase_request'
+  autoload :Resource, 'erp_integration/resource'
+  autoload :SalesOrder, 'erp_integration/sales_order'
+  autoload :SalesOrderLine, 'erp_integration/sales_order_line'
+  autoload :StockMove, 'erp_integration/stock_move'
+  autoload :SupplierShipment, 'erp_integration/supplier_shipment'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erp_integration
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Stefan Vermaas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -48,16 +48,22 @@ dependencies:
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -259,19 +265,25 @@ files:
 - lib/erp_integration/fulfil/client.rb
 - lib/erp_integration/fulfil/query.rb
 - lib/erp_integration/fulfil/query_methods.rb
-- lib/erp_integration/fulfil/resources/order.rb
-- lib/erp_integration/fulfil/resources/order_line.rb
+- lib/erp_integration/fulfil/resources/product.rb
 - lib/erp_integration/fulfil/resources/purchase_order.rb
 - lib/erp_integration/fulfil/resources/purchase_order_line.rb
 - lib/erp_integration/fulfil/resources/purchase_request.rb
+- lib/erp_integration/fulfil/resources/sales_order.rb
+- lib/erp_integration/fulfil/resources/sales_order_line.rb
+- lib/erp_integration/fulfil/resources/stock_move.rb
+- lib/erp_integration/fulfil/resources/supplier_shipment.rb
 - lib/erp_integration/fulfil/where_clause.rb
 - lib/erp_integration/middleware/error_handling.rb
-- lib/erp_integration/order.rb
-- lib/erp_integration/order_line.rb
+- lib/erp_integration/product.rb
 - lib/erp_integration/purchase_order.rb
 - lib/erp_integration/purchase_order_line.rb
 - lib/erp_integration/purchase_request.rb
 - lib/erp_integration/resource.rb
+- lib/erp_integration/sales_order.rb
+- lib/erp_integration/sales_order_line.rb
+- lib/erp_integration/stock_move.rb
+- lib/erp_integration/supplier_shipment.rb
 - lib/erp_integration/version.rb
 homepage: https://www.github.com/mejuri-inc/erp-integration
 licenses: