valken-shipping 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e84c0d4116d7966aa6f084fdf5fe4b18fe78fa8a7b4ae0e0ccf0da055dba6827
-  data.tar.gz: 0e75818f95bc1434dc81cccd4dc1f6f9d97a80db445d9246ce3ee14f6f4d352a
+  metadata.gz: 3a7479a62094f25d2a3bed078783fa64e87d1df2589126a5428139389d16a584
+  data.tar.gz: 62dbd43d9ecc4df5474ef1dd9a3e544885c72704f10c5d4611ed526ac1a5ebf7
 SHA512:
-  metadata.gz: dd4fb785e8735a2c80b833d8c0cce78dc2e88b235f0256320d1df3574679fda4d382b7a57752e7c8cfdc0f9976c54c8f28a3e5a44134e0406787a46a0a814c38
-  data.tar.gz: 6b977128805bc0b99b50bbb10429eec3fc759d0bdd926808e56bd71b655f0426ab50773af3f31fd2d3f072007a1af06e7d86e93753b6211d152e702b7d4ab09d
+  metadata.gz: 2d6e57218303abfe50301f1c1d4d000f890af7f15293ed93c6ec735e16f57682c2a2b80a4d46eff1218d69f7632bc1782d7d7585faa566da097592be761c411f
+  data.tar.gz: bb00c7c168791983e2ab1d557de2d296b37a32bf5edf6ca0cfa5d8ca9ff5b78bbaf80a0fabdb51646af1a6d612d4209c215694863628735408003c689f4153f2

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

@@ -13,8 +13,11 @@ module Workarea
 
     def shipping_option
       carrier_data = collect_carrier_data(selected_carrier)
-      free = carrier_data.push(get_ltl_shipping)
-      info = free.push(get_free_shipping)
+      if Workarea.config.gateways.ups_carrier.class != ActiveShipping::Workarea
+        carrier_data.push(get_ltl_shipping)
+        carrier_data.push(get_free_shipping)
+      end
+      carrier_data
     end
 
     def selected_carrier
@@ -34,16 +37,17 @@ 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
       ups = get_ups_data.first
       fedex = get_fedex_data.first
+      return [] unless ups || fedex
       if ups.price > fedex.price
         return get_fedex_data
       else
@@ -108,13 +112,19 @@ module Workarea
         packaging.packages
       )
 
-      filtered_options = []
-      response.rates.sort_by(&:price).each do |rate|
-        if service_code[rate.service_code].present?
-          filtered_options.push(create_shipping_options(rate, service_code))
+      if carrier.class == ActiveShipping::Workarea
+        response.rates.sort_by(&:price).map do |rate|
+          ShippingOption.from_rate_estimate(rate)
+        end
+      else
+        filtered_options = []
+        response.rates.sort_by(&:price).each do |rate|
+          if service_code[rate.service_code].present?
+            filtered_options.push(create_shipping_options(rate, service_code))
+          end
         end
+        filtered_options
       end
-      filtered_options
     end
 
     def create_shipping_options(rate, service_code)

data/app/services/workarea/packaging.decorator

@@ -10,7 +10,21 @@ module Workarea
     def find_sku_weight(sku)
       sku_data = Catalog::Product.find_by_sku(sku).variants
       sku = sku_data.detect {|variant| variant.sku == sku }
-      sku.weight || 0
+      if is_pounds(sku)
+        convert_to_lb(sku.weight || 0)
+      else
+        sku.weight || 0
+      end
+    end
+
+    def convert_to_lb(weight)
+      unit = Measured::Weight.new(weight, :lb)
+      unit.convert_to(:oz)
+      unit.value
+    end
+
+    def is_pounds(sku)
+      sku.weight_unit == "lb"
     end
   end
 end

data/config/initializers/workarea.rb

@@ -1,6 +1,9 @@
-Workarea.configure do |config|   
+Workarea.configure do |config|
+  ActiveShipping::Carriers.register :UPS,    'active_shipping/carriers/ups'
+
   config.weight_table = {"2": 5, "15": 15, "200": 1, "2500": 200}
 
   config.ups_options = {"01"=> "3 Day", "03"=> "Overnight", "02"=> "2 Day"}
   config.fedex_options = {"STANDARD_OVERNIGHT"=> "Overnight", "FEDEX_2_DAY"=> "2 Day", "GROUND_HOME_DELIVERY"=> "3 Day"}
 end
+Valken::Shipping.auto_initialize_gateway

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 ups_credentials
+          self.fedex_gateway = ActiveShipping::FedEx.new fedex_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.2.0'
   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.2.0
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails