ruby-gpwebpay 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd62ae0dcdc32dd0a8f31f7010d9583e895ebf91db3fb2b287c37fef21b7f9b9
-  data.tar.gz: c6a4bb0a3ba295ab25e947a61a94db8928d08d3c5ffa0ffede7cdad832ae64f1
+  metadata.gz: 1792faa9020776a63e8e2c1ac0627409d877bdee1bbdec3b7ac807be222a85d7
+  data.tar.gz: 7287f8a204b434f02b465c3ccabc394a9c3a0084a6ade9bf959bb6fe76cd9e7d
 SHA512:
-  metadata.gz: 011060e88a5dbaf8cf6bf919e985d99c11914fee36d98d31c5f6a4b35c28bb73254c3fb0123f18c4434def9abf629b04e5ccb451bbb1b13af806a35a0d0e69ac
-  data.tar.gz: 22d6f3eca73020be4c8bcb094903338ececba81a77b8f8e26ac081e109d480de1f9524a72df75fa7c4f1ec7fa82a1cc1abe3988932122b9f480cc8d976960a36
+  metadata.gz: e655b1c79712a6a12da62451fdb239e242dc5b29fc90b35db94de4a6d474aa6b4eff02e4c43bafe168dbd98bfe52dd620c1d8661f1055dcdeae8d6c04d0a67ec
+  data.tar.gz: f7b9d913cac4c2ddc2a2a11fba64fe65788e56c6f9b8130f39bcf6e15ac6fac3191c2fe0198376ee2fa16628e435db1f13bbc7a7e4e30a4540595eec22eeaec3

data/lib/gp_webpay/config.rb

@@ -25,6 +25,7 @@ module GpWebpay
     config_accessor :environment do
       defined?(Rails) && Rails.env || "test"
     end
+    config_accessor :debug do false; end
 
     def param_name
       config.param_name.respond_to?(:call) ? config.param_name.call : config.param_name

data/lib/gp_webpay/payment.rb

@@ -43,7 +43,7 @@ module GpWebpay
     private
 
     def pay_verification_attrs
-      %i(operation order_number prcode srcode resulttext)
+      %i(OPERATION ORDERNUMBER PRCODE SRCODE RESULTTEXT)
     end
 
     def pay_attributes

data/lib/gp_webpay/verification.rb

@@ -6,7 +6,7 @@ module GpWebpay
       @payment_attributes = payment_attributes
       GpWebpay.logger.info "Payment Attrs: #{@payment_attributes}"
       @verification_attrs = verification_attrs
-      GpWebpay.logger.info "Verification Attrs: #{@verification_attrs}"
+      GpWebpay.logger.info "Verification Attrs: #{@verification_attrs}" if @verification_attrs
     end
 
     def verified_response?(params)

data/lib/gp_webpay/version.rb

@@ -1,3 +1,3 @@
 module GpWebpay
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 end

data/lib/gp_webpay/web_services.rb

@@ -9,6 +9,7 @@ module GpWebpay
     extend ActiveSupport::Concern
 
     def send_request(request_xml)
+      GpWebpay.logger.debug "WS Raw request: #{request_xml}" if GpWebpay.config.debug
       request = Curl::Easy.new(config.web_services_url)
       request.headers["Content-Type"] = "text/xml;charset=UTF-8"
       request.http_post(request_xml)
@@ -30,24 +31,28 @@ module GpWebpay
     def ws_process_regular_subscription_payment
       attributes = request_attributes("processRegularSubscriptionPayment")
       raw_response = send_request(template.process_regular_subscription_payment(attributes)).body_str
+      GpWebpay.logger.debug "WS Raw response: #{raw_response}" if GpWebpay.config.debug
       get_params_from(raw_response)
     end
 
     def ws_get_payment_detail
       attributes = request_attributes("getPaymentDetail")
       raw_response = send_request(template.get_payment_detail(attributes)).body_str
+      GpWebpay.logger.debug "WS Raw response: #{raw_response}" if GpWebpay.config.debug
       get_params_from(raw_response)
     end
 
     def ws_get_payment_status
       attributes = request_attributes("getPaymentStatus")
       raw_response = send_request(template.get_payment_status(attributes)).body_str
+      GpWebpay.logger.debug "WS Raw response: #{raw_response}" if GpWebpay.config.debug
       get_params_from(raw_response)
     end
 
     def ws_get_master_payment_status
       attributes = request_attributes("getMasterPaymentStatus")
       raw_response = send_request(template.get_master_payment_status(attributes)).body_str
+      GpWebpay.logger.debug "WS Raw response: #{raw_response}" if GpWebpay.config.debug
       get_params_from(raw_response)
     end
 
@@ -71,39 +76,49 @@ module GpWebpay
       hash_response = hash_response["#{first_lvl_key}"]
       second_lvl_key = hash_response.keys.last
       hash_response = hash_response["#{second_lvl_key}"]
+      GpWebpay.logger.info "Response: #{hash_response}"
       GpWebpay::WebServices::Response.new(hash_response)
     end
 
     def request_attributes(type = "")
-      {
+      base_attributes = {
         message_id: message_id(type),
         merchant_number: config.merchant_number,
         order_number: order_number,
-        merchant_order_number: merchant_order_number,
-        master_order_number: master_order_number,
-        amount: amount_in_cents,
-        capture_flag: capture_flag,
-        card_holder_name: card_holder.name,
-        card_holder_email: card_holder.email,
-        card_holder_phone_country: card_holder.phone_country,
-        card_holder_phone: card_holder.phone,
-        card_holder_mobile_phone_country: card_holder.mobile_phone_country,
-        card_holder_mobile_phone: card_holder.mobile_phone,
-        address_match: address_match,
-        billing_name: billing.name,
-        billing_address1: billing.address1,
-        billing_city: billing.city,
-        billing_postal_code: billing.postal_code,
-        billing_country: billing.country,
-        shipping_name: shipping.name,
-        shipping_address1: shipping.address1,
-        shipping_city: shipping.city,
-        shipping_postal_code: shipping.postal_code,
-        shipping_country: shipping.country,
         digest: ws_verification(type).digest,
-        # Deprecated Attrs, will remove
-        currency: currency,
       }
+
+      case type
+      when "processRegularSubscriptionPayment"
+        payment_attributes = {
+          merchant_order_number: merchant_order_number,
+          master_order_number: master_order_number,
+          amount: amount_in_cents,
+          capture_flag: capture_flag,
+          card_holder_name: card_holder.name,
+          card_holder_email: card_holder.email,
+          card_holder_phone_country: card_holder.phone_country,
+          card_holder_phone: card_holder.phone,
+          card_holder_mobile_phone_country: card_holder.mobile_phone_country,
+          card_holder_mobile_phone: card_holder.mobile_phone,
+          address_match: address_match,
+          billing_name: billing.name,
+          billing_address1: billing.address1,
+          billing_city: billing.city,
+          billing_postal_code: billing.postal_code,
+          billing_country: billing.country,
+          shipping_name: shipping.name,
+          shipping_address1: shipping.address1,
+          shipping_city: shipping.city,
+          shipping_postal_code: shipping.postal_code,
+          shipping_country: shipping.country,
+          # Deprecated Attrs, will remove
+          currency: currency,
+        }
+        base_attributes.merge(payment_attributes)
+      else
+        base_attributes
+      end
     end
 
     def config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gpwebpay
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrej Antas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport