oca-epak 1.1.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63d16a3f53e35acefdb9f763c3d343ab7b56dc9b
-  data.tar.gz: 8e0ec175cc444b726e8594cde4eae24b954a0d53
+  metadata.gz: b770b600437c06428ca3857ee228823915a249b5
+  data.tar.gz: 9cca002c4d209ad4824026486fa959730e9181ae
 SHA512:
-  metadata.gz: 8f673dfb5d956e2bba94cb5967b655428c484d5e29302153e3896e954461c758ce7df8ff2a2b8d9fb2c826a8e8b3ef7cee8207cd1d97312264b26d737c44929e
-  data.tar.gz: e4feaf827f85af4f73412ae736c0d555fbb8096c8f77e1ada9d1d2de009c92db9f9ab8f71b0e1e434336638c4633aae333244fb3f11cb806a45a1f60fb427a4f
+  metadata.gz: 2b707fa3733af3a184bce13abbb4802c3147c8b95d4a0f2bceba5faadacab82dc2484864b142f36b0c2022c817aa811308575bd8560242cc28d84e4710d58768
+  data.tar.gz: 897ee612dcb938f5adf5e97374647b855afbe9b669820da0252fd85135a2e27074baff33cf409811cb7bfb53ad7df87aa659a3a64fab3fef62d06cbba9aa966d

data/lib/oca-epak/base_client.rb

@@ -20,10 +20,12 @@ module Oca
         end
       end
 
+      # @return [Array, nil]
       def parse_results_table(response, method)
         if result = parse_result(response, method)
           if result[:diffgram][:new_data_set]
-            result[:diffgram][:new_data_set][:table]
+            table = result[:diffgram][:new_data_set][:table]
+            table.is_a?(Hash) ? [table] : table
           else
             raise Oca::Errors::BadRequest.new("Oca WS responded with:\n#{response.body}")
           end

data/lib/oca-epak/epak/client.rb

@@ -14,34 +14,18 @@ module Oca
         method = :get_epack_user
         opts = { "usr" => username, "psw" => password }
         response = client.call(method, message: opts)
-        parse_results_table(response, method)[:existe] == "1"
-      end
-
-      # Checks whether the operation is valid
-      #
-      # @param [String] Client's CUIT
-      # @param [String] Operation Type
-      # @return [Boolean]
-      def check_operation(cuit, op)
-        begin
-          opts = { wt: "50", vol: "0.027", origin: "1414", destination: "5403",
-                   qty: "1", total: "123", cuit: cuit, op: op }
-          get_shipping_rates(opts)
-          true
-        rescue Oca::Errors::GenericError => e
-          false
-        end
+        parse_results_table(response, method).first[:existe] == "1"
       end
 
       # Creates a Pickup Order, which lets OCA know you want to make a delivery.
       #
-      # @see [http://www.ombushop.com/oca/documentation.pdf] #TODO put it there
+      # @see https://github.com/ombulabs/oca-epak/blob/master/doc/OCAWebServices.pdf
       #
       # @param [Hash] opts
-      # @option [Oca::Epak::PickupData] :pickup_data Pickup Data object
-      # @option [Boolean] :confirm_pickup Confirm Pickup? Defaults to false
-      # @option [Integer] :days_to_pickup Days OCA should wait before pickup, default: 1
-      # @option [Integer] :pickup_range Range to be used when picking it up, default: 1
+      # @option opts [Oca::Epak::PickupData] :pickup_data Pickup Data object
+      # @option opts [Boolean] :confirm_pickup Confirm Pickup? Defaults to false
+      # @option opts [Integer] :days_to_pickup Days OCA should wait before pickup, default: 1
+      # @option opts [Integer] :pickup_range Range to be used when picking it up, default: 1
       # @return [Hash, nil]
       def create_pickup_order(opts = {})
         confirm_pickup = opts.fetch(:confirm_pickup, false)
@@ -61,25 +45,28 @@ module Oca
       # Get rates and delivery estimate for a shipment
       #
       # @param [Hash] opts
-      # @option [String] :wt Total Weight e.g: 20
-      # @option [String] :vol Total Volume e.g: 0.0015 (0.1mts * 0.15mts * 0.1mts)
-      # @option [Integer] :origin Origin ZIP Code
-      # @option [Integer] :destination Destination ZIP Code
-      # @option [Integer] :qty Quantity of Packages
-      # @option [Integer] :total Declared Value
-      # @option [String] :cuit Client's CUIT e.g: 30-99999999-7
-      # @option [String] :op Operation Type
+      # @option opts [String] :total_weight Total Weight e.g: 20
+      # @option opts [String] :total_volume Total Volume e.g: 0.0015
+      #                                (0.1mts * 0.15mts * 0.1mts)
+      # @option opts [String] :origin_zip_code Origin ZIP Code
+      # @option opts [String] :destination_zip_code Destination ZIP Code
+      # @option opts [String] :declared_value Declared Value
+      # @option opts [String] :package_quantity Quantity of Packages
+      # @option opts [String] :cuit Client's CUIT e.g: 30-99999999-7
+      # @option opts [String] :operation_code Operation Type
       # @return [Hash, nil] Contains Total Price, Delivery Estimate
-      def get_shipping_rates(opts = {})
+      def get_shipping_rate(opts = {})
         method = :tarifar_envio_corporativo
-        message = { "PesoTotal" => opts[:wt], "VolumenTotal" => opts[:vol],
-                    "CodigoPostalOrigen" => opts[:origin],
-                    "CodigoPostalDestino" => opts[:destination],
-                    "ValorDeclarado" => opts[:total],
-                    "CantidadPaquetes" => opts[:qty], "Cuit" => opts[:cuit],
-                    "Operativa" => opts[:op] }
+        message = { "PesoTotal" => opts[:total_weight],
+                    "VolumenTotal" => opts[:total_volume],
+                    "CodigoPostalOrigen" => opts[:origin_zip_code],
+                    "CodigoPostalDestino" => opts[:destination_zip_code],
+                    "ValorDeclarado" => opts[:declared_value],
+                    "CantidadPaquetes" => opts[:package_quantity],
+                    "Cuit" => opts[:cuit],
+                    "Operativa" => opts[:operation_code] }
         response = client.call(method, message: message)
-        parse_results_table(response, method)
+        parse_results_table(response, method).first
       end
 
       # Returns all existing Taxation Centers

data/lib/oca-epak/oep/client.rb

@@ -9,9 +9,9 @@ module Oca
 
       # Returns the HTML for a label
       #
-      # @param opts
-      # @option id_orden_retiro [Integer]
-      # @option nro_envio [String]
+      # @param [Hash] opts
+      # @option opts [Integer] :id_orden_retiro
+      # @option opts [String] :nro_envio
       # @return [String] HTML
       def get_html_de_etiquetas_por_orden_or_numero_envio(opts = {})
         method = :get_html_de_etiquetas_por_orden_or_numero_envio

data/lib/oca-epak/pickup_data.rb

@@ -6,9 +6,9 @@ module Oca
       # Creates a Pickup Data object for creating a pickup order in OCA.
       #
       # @param [Hash] opts
-      # @option [String] :account_number Account Number (SAP)
-      # @option [Hash] :pickup Pickup Hash
-      # @option [Array<Hash>] :shipments Shipments Hash
+      # @option opts [String] :account_number Account Number (SAP)
+      # @option opts [Hash] :pickup Pickup Hash
+      # @option opts [Array<Hash>] :shipments Shipments Hash
       def initialize(opts = {})
         self.account_number = opts[:account_number]
         self.pickup = opts[:pickup]

data/lib/oca-epak/retiro.xml.erb

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>
+<ROWS>
+	<cabecera ver="1.0" nrocuenta="<%= account_number %>" />
+	<retiro calle="<%= pickup['calle'] %>" nro="<%= pickup['numero'] %>" piso="<%= pickup['piso'] %>" depto="<%= pickup['departamento'] %>" cp="<%= pickup['cp'] %>" localidad="<%= pickup['localidad'] %>" provincia="<%= pickup['provincia'] %>" contacto="<%= pickup['solicitante'] %>" email="<%= pickup['email'] %>" solicitante="<%= pickup['solicitante'] %>" observaciones="<%= pickup['observaciones'] %>" centrocosto="<% if pickup['centro_de_costo'] %><%= pickup['centro_de_costo'] %><% else %>0<% end %>" />
+	<envios>
+    <%- shipments.each do |shipment| -%>
+		<envio idoperativa="<%= shipment['id_operativa'] %>" nroremito="<%= shipment['numero_remito'] %>">
+			<destinatario apellido="<%= shipment['destinatario']['apellido'] %>" nombre="<%= shipment['destinatario']['nombre'] %>" calle="<%= shipment['destinatario']['calle'] %>" nro="<%= shipment['destinatario']['numero'] %>" piso="<%= shipment['destinatario']['piso'] %>" depto="<%= shipment['destinatario']['departamento'] %>" cp="<%= shipment['destinatario']['cp'] %>" localidad="<%= shipment['destinatario']['localidad'] %>" provincia="<%= shipment['destinatario']['provincia'] %>" telefono="<%= shipment['destinatario']['telefono'] %>" email="<%= shipment['destinatario']['email'] %>" idci="<% if shipment['destinatario']['centro_de_costo'] %><%= shipment['destinatario']['centro_de_costo'] %><% else %>0<% end %>" celular="<%= shipment['destinatario']['celular'] %>"/>
+			<paquetes>
+        <%- shipment['paquetes'].each do |package|-%>
+				<paquete alto="<%= package['alto'] %>" ancho="<%= package['ancho'] %>" largo="<%= package['largo'] %>" peso="<%= package['peso'] %>" valor="<%= package['valor_declarado'] %>" cant="<%= package['cantidad'] %>"/>
+				<%- end -%>
+			</paquetes>
+		</envio>
+		<%- end -%>
+	</envios>
+</ROWS>

data/lib/oca-epak/version.rb

@@ -1,5 +1,5 @@
 module Oca
   module Epak
-    VERSION = '1.1.0'
+    VERSION = '1.5.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oca-epak
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Mauro Otonelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -110,9 +110,11 @@ files:
 - lib/oca-epak/errors/generic_error.rb
 - lib/oca-epak/oep/client.rb
 - lib/oca-epak/pickup_data.rb
+- lib/oca-epak/retiro.xml.erb
 - lib/oca-epak/version.rb
 homepage: https://github.com/ombulabs/oca-epak
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []