valken-shipping 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e84c0d4116d7966aa6f084fdf5fe4b18fe78fa8a7b4ae0e0ccf0da055dba6827
-  data.tar.gz: 0e75818f95bc1434dc81cccd4dc1f6f9d97a80db445d9246ce3ee14f6f4d352a
+  metadata.gz: 04745f3ed0c5ecabf3975b0f071f244dbff18a6374f81feae40d39f4f546656c
+  data.tar.gz: 7a3073049e68c67f11b3764e1fc68c01479313f75c1d37f803b574629a2e9eb4
 SHA512:
-  metadata.gz: dd4fb785e8735a2c80b833d8c0cce78dc2e88b235f0256320d1df3574679fda4d382b7a57752e7c8cfdc0f9976c54c8f28a3e5a44134e0406787a46a0a814c38
-  data.tar.gz: 6b977128805bc0b99b50bbb10429eec3fc759d0bdd926808e56bd71b655f0426ab50773af3f31fd2d3f072007a1af06e7d86e93753b6211d152e702b7d4ab09d
+  metadata.gz: aa58934d2b87f6f334fe5461d2c0c02c91e01984344bdaa0964af467052cad20774de90f2c61ec1afd49a21ba8748a67d121f7871e07aea74161823678ce0b47
+  data.tar.gz: d5bd1cfe4fe351ce5e92cb9c8ae6863c01d1d9ce8df254e89f6dfaf370b66139122803b80f2f605138c16d55a8d3aeaa3b742bfde167562aa1841aa81b110c0a

data/app/models/workarea/checkout/shipping_options.decorator

@@ -34,11 +34,11 @@ module Workarea
     end
 
     def get_ups_data
-      ups_options = get_options(ActiveShipping::UPS.new(Rails.application.secrets.ups_carrier), Workarea.config.ups_options)
+      ups_options = get_options(Workarea.config.gateways.ups_carrier, Workarea.config.ups_options)
     end
 
     def get_fedex_data
-      fedex_response = get_options(ActiveShipping::FedEx.new(Rails.application.secrets.fedex_carrier), Workarea.config.fedex_options)
+      fedex_response = get_options(Workarea.config.gateways.fedex_carrier, Workarea.config.fedex_options)
     end
 
     def get_none_data

data/config/initializers/workarea.rb

@@ -1,3 +1,5 @@
+Valken::Shipping.auto_initialize_gateway
+
 Workarea.configure do |config|   
   config.weight_table = {"2": 5, "15": 15, "200": 1, "2500": 200}
 

data/lib/valken/shipping.rb

@@ -1,7 +1,42 @@
+require 'workarea'
+require 'workarea/storefront'
+require 'workarea/admin'
 require "valken/shipping/engine"
 
 module Valken
   module Shipping
-    # Your code goes here...
+
+    def self.ups_credentials
+      return {} unless Rails.application.secrets.ups_carrier.present?
+      Rails.application.secrets.ups_carrier.symbolize_keys
+    end
+
+    def self.fedex_credentials
+      return {} unless Rails.application.secrets.fedex_carrier.present?
+      Rails.application.secrets.fedex_carrier.symbolize_keys
+    end
+
+    def self.ups_gateway=(gateway)
+      Workarea.config.gateways.ups_carrier = gateway
+    end
+
+    def self.fedex_gateway=(gateway)
+      Workarea.config.gateways.fedex_carrier = gateway
+    end
+
+    def self.auto_initialize_gateway
+      if ups_credentials.present? && fedex_credentials.present?
+        if Rails.env.test?
+          self.ups_gateway = ActiveShipping::Workarea.new
+          self.fedex_gateway = ActiveShipping::Workarea.new
+        else
+          self.ups_gateway = ActiveShipping::UPS.new credentials
+          self.fedex_gateway = ActiveShipping::FedEx.new credentials
+        end
+      else
+        self.ups_gateway = ActiveShipping::Workarea.new
+        self.fedex_gateway = ActiveShipping::Workarea.new
+      end
+    end
   end
-end
+end

data/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails