paymob_accept 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74ac2d808d84a3858e5ea44a1b6db205c28d0f092bc06fac9569766aca7f993a
-  data.tar.gz: 0104bfacb501475891edebcdf30f7f68e61ac259b45b75a9c556a0cc917009a4
+  metadata.gz: a858f0d51d53e165acf7bb759286fd6d3ffba067068342e1356d98edf9523652
+  data.tar.gz: 05d5404002d4ff545c32c67f310d1c42cdb0ea6869fa03f46938a1cf9d15638f
 SHA512:
-  metadata.gz: 52bc4b9d8af84a9df149edf279aa782391346bcd1de3adfe21ec4416c39f625b2dc5afa7b12b1e74a4fde43ed4575ec07bfbea292818403df5796c5e0a0f9096
-  data.tar.gz: 959e4ab4f5257eb40d115d2e70edc43e593b52acba626a5eed866df261f0b2171648c48231f191c33bf019c5cf2c48fe4c7c9f170f0d4d616fa55aabbb0e9579
+  metadata.gz: 130578e9ccb379fc2b8bd76a22d149502d8177a52026abffca362456f30341055979f2b8478322ef55e1edd1408cf124916c6a885be23aa229d36cc02b4bc0c3
+  data.tar.gz: 793edd6500af9628d4746bb40c9b824e035e05bf3ddb819dfc546d41f82d1d6d44f98e7db5407fc0506184fe43f2c598771f14bd4f24b96f879648bf744e324c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paymob_accept (0.3.0)
+    paymob_accept (0.3.2)
       faraday
       json-schema
 

data/README.md

@@ -112,11 +112,15 @@ The `:method` key in the `charge` method could be one of the following:
 
 Please refer to the official Paymob documentation for in-depth explanation about each payment method.
 
-The return value of the `charge` method in general is the response of Paymob's server which varies according to the payment method except in `:online`. In an `:online` payment if an `iframe_id` is provided, the return value is an iFrame URL with an embedded payment token. If the `iframe_id` is not provided, only the payment token is returned
+The return value of the `charge` method in general is the response of Paymob's server which varies according to the payment method except in `:online`. In an `:online` payment if an `iframe_id` is provided, the return value is an iFrame URL with an embedded payment token. If the `iframe_id` is not provided, only the payment token and order_id is returned
 
 ### Paying with a saved card token
 
-To pre-fill an iFrame with a customer card data or process a MOTO charge, make sure the `customer_data` hash has a `cc_token` key in addition to the fields mentioned above.
+```ruby
+ def pay_moto(customer:, address:, cc_token:, amount_cents:, amount_currency:)
+```
+
+- To pre-fill an iFrame with a customer card data or process a MOTO charge, make sure to pass the `cc_token` key in addition to the fields mentioned above.
 
 ## Dealing with charges
 

data/lib/paymob_accept/api/base.rb

@@ -28,20 +28,20 @@ module PaymobAccept
       end
 
       # 3. Payment Key Request
-      def generate_payment_intent(customer:, address:, integration_id:, amount_cents:, amount_currency:, iframe_id: nil, order_id: nil, auth_token: get_auth_token)
+      def generate_payment_intent(customer:, address:, integration_id:, amount_cents:, amount_currency:, cc_token: nil, iframe_id: nil, order_id: nil, auth_token: get_auth_token)
         if order_id.nil?
           order = create_order(amount_cents: amount_cents, amount_currency: amount_currency)
           order_id = order['id']
         end
         payment_token = generate_payment_key(auth_token: auth_token, customer: customer, address: address, order_id: order_id, amount_cents: amount_cents, amount_currency: amount_currency,
-                                             integration_id: integration_id)
+                                             integration_id: integration_id, cc_token: cc_token)
 
-        format_bill_reference(payment_token, iframe_id)
+        { token: format_bill_reference(payment_token, iframe_id), order_id: order_id }
       end
 
       private
 
-      def generate_payment_key(customer:, address:, amount_cents:, amount_currency:, integration_id:, order_id: nil, auth_token: get_auth_token)
+      def generate_payment_key(customer:, address:, amount_cents:, amount_currency:, integration_id:, cc_token: nil, order_id: nil, auth_token: get_auth_token)
         body = {
           "auth_token": auth_token,
           "amount_cents": amount_cents.to_i,
@@ -65,7 +65,7 @@ module PaymobAccept
           },
           "integration_id": integration_id
         }
-        body['token'] = customer[:cc_token] unless customer[:cc_token].nil?
+        body['token'] = cc_token unless cc_token.nil?
 
         response = @client.request('/acceptance/payment_keys', body)
 
@@ -98,7 +98,6 @@ module PaymobAccept
             "last_name": { "type": 'string' },
             "email": { "type": 'string' },
             "phone_number": { "type": 'string' },
-            "cc_token": { "type": 'string' },
             "wallet_mobile_number": { "type": 'string' }
           },
           "required": %w[email phone_number]

data/lib/paymob_accept/api/pay.rb

@@ -30,21 +30,21 @@ module PaymobAccept
 
       private
 
-      def pay_auth(customer:, address:, amount_cents:, amount_currency:)
+      def pay_auth(customer:, address:, amount_cents:, amount_currency:, iframe_id: nil, cc_token: nil)
         generate_payment_intent(customer: customer, address: address, amount_cents: amount_cents, amount_currency: amount_currency,
-                                integration_id: auth_integration_id)
+                                integration_id: auth_integration_id, iframe_id: iframe_id, cc_token: cc_token)
       end
 
       # Return an iFrame URL if an iframe_id is provided. Otherwise, returns a payment token
-      # The iFrame will be prepoulated with the credit card info if customer[cc_token] is present and is valid stored credit card token on Paymob's server
-      def pay_online(customer:, address:, amount_cents:, amount_currency:, iframe_id: nil)
+      # The iFrame will be prepoulated with the credit card info if cc_token is present and is valid stored credit card token on Paymob's server
+      def pay_online(customer:, address:, amount_cents:, amount_currency:, cc_token: nil, iframe_id: nil)
         generate_payment_intent(customer: customer, address: address, amount_cents: amount_cents, amount_currency: amount_currency,
-                                integration_id: online_integration_id, iframe_id: iframe_id)
+                                integration_id: online_integration_id, iframe_id: iframe_id, cc_token: cc_token)
       end
 
       # Paying MOTO (ie. with a saved card token)
-      def pay_moto(customer:, address:, amount_cents:, amount_currency:)
-        if customer[:cc_token].nil?
+      def pay_moto(customer:, address:, cc_token:, amount_cents:, amount_currency:)
+        if cc_token.nil?
           raise ArgumentError,
                 'You need to provide a credit card token for MOTO payments'
         end
@@ -52,7 +52,7 @@ module PaymobAccept
         bill_reference = generate_payment_intent(customer: customer, address: address, amount_cents: amount_cents, amount_currency: amount_currency,
                                                  integration_id: auth_integration_id)
         body = {
-          "source": { "subtype": 'TOKEN', "identifier": customer[:cc_token] },
+          "source": { "subtype": 'TOKEN', "identifier": cc_token },
           "payment_token": bill_reference
         }
         @client.request('/acceptance/payments/pay', body)

data/lib/paymob_accept/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paymob_accept
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - OneOrder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-02 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday