easy_pay_u_latam 0.1.21 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8eee2fadb4bd7eb0470ba74dfcb62ec90ee78bf824f2ac475ff4f78355c40c9
-  data.tar.gz: 1c45508dddbdde111502644b6002bbd946b072bfb86eb8a830a62addfdda8e2c
+  metadata.gz: be1a9f5b57f8b29f80c0b25b98b3f289333f76758dcc409cd1311f5820c44145
+  data.tar.gz: 1ac5e27558b5d49f0a67a5669ba9f51cac364f15fbe5326396db8e06a6aa9edd
 SHA512:
-  metadata.gz: 458e3f68a3313d423748841f18315e2fecf1ecb300a1611cda682e634c440e43777c05a825bab1a1f5b0b77e5a244a316428f4f667483928816145236dcc4118
-  data.tar.gz: 1ebbdb3e0f24f4903b69c5401f66501d4dc316965d555d3f3530484c19f1e0738c262c0fb78e11d38ea044d7b635981771a9d86a01cd75ed6322071fbae17fa1
+  metadata.gz: 2e0e77b13e0b7d2411146f7622463e76d73ff6b78a11a00b5c9bf742385b8835ecde045611aa0021392902e0bb5d7d344505f18aa803170ccf1cec2695fdcfe9
+  data.tar.gz: d5c597aab103755e374e50fb556747e5e34ec56fbf24683279a95027531b5ed7e2013afeee0c8dae39357df1b22a1fc04386d7fdcc8abdc1985fb8ae5b10a8ee

data/README.md

@@ -35,7 +35,7 @@ $ rails g migration AddPayUFieldsToUsers payu_default_card:string payu_customer_
 
 Only run this when recurrent payments are ON, extra fields for recurrent payments on payments table, you must run the following migration.
 ```bash
-$ rails g migration AddRecurrentPaymentsToEasyPayULatamPayuPayments payu_plan_id:string payu_plan_code:string payu_customer_id:string payu_subscription_id:string trial_days:integer payu_credit_card_token:string  
+$ rails g migration AddRecurrentPaymentsToEasyPayULatamPayuPayments payu_plan_id:string payu_plan_code:string payu_customer_id:string payu_subscription_id:string trial_days:integer payu_credit_card_token:string  additional_charges_data:string
 ```
 
 If you want to keep a reference to plans, before this you must have created a plan model on your project, you can run the following migration (User only when recurrent payments are ON).
@@ -68,6 +68,16 @@ EasyPayULatam.configure do |config|
   #Pay U will consume a Web Service and it can not be in localhost, you most use something like ngrok
   config.test_root_url = "ROOT URL FOR TESTING"
   config.currency_precision = 2 #By default is 0 for colombian peso
+  config.testing = true #Set false in production
+end
+
+# This keys are different, the recursive API use other keys
+EasyPayULatam::RApi.configure do |config|
+  config.api_login  = 'YOUR KEY'
+  config.api_key    = 'YOUR KEY'
+  config.account_id = 'YOUR PAY U ACCOUNT ID'
+  config.sandbox    = true #Set false in production
+  config.api_version    = "v4.3"
 end
 ```
 

data/app/assets/javascripts/easy_pay_u_latam/subscriptions/controllers/Subscriptions.js

@@ -56,27 +56,27 @@
       }, 100);
 
       $('#new-credit-card-modal').on('shown.bs.modal', function () {
-        // if (self.create_subscription_after_new_card == true){
-        //   swal({
-        //     title: 'Confirmación',
-        //     text: "Cargaremos a tu tarjeta principal mensualmente el valor del plan hasta que canceles la subscripción.",
-        //     type: 'info',
-        //     showCancelButton: true,
-        //     confirmButtonColor: '#3085d6',
-        //     cancelButtonColor: '#d33',
-        //     confirmButtonText: 'Si, continuar',
-        //     cancelButtonText: "Cancelar"
-        //   }).then((result) => {
-        //     if (result) {
-        //       $scope.$evalAsync(function(){
-        //         ('#new-credit-card-modal').modal("show");
-        //       });
-        //     }
-        //     else{
-        //       self.create_subscription_after_new_card = false;
-        //     }
-        //   });
-        // }
+        if (self.create_subscription_after_new_card == true){
+          swal({
+            title: 'Confirmación',
+            text: "Cargaremos a tu tarjeta principal mensualmente el valor del plan hasta que canceles la subscripción.",
+            type: 'info',
+            showCancelButton: true,
+            confirmButtonColor: '#3085d6',
+            cancelButtonColor: '#d33',
+            confirmButtonText: 'Si, continuar',
+            cancelButtonText: "Cancelar"
+          }).then((result) => {
+            if (result) {
+              $scope.$evalAsync(function(){
+                ('#new-credit-card-modal').modal("show");
+              });
+            }
+            else{
+              self.create_subscription_after_new_card = false;
+            }
+          });
+        }
       })
     }
 
@@ -127,10 +127,6 @@
       $http.get("/easy_pay_u_latam/api/v1/pay_u_cards.json", {params: params}).then(
         function(res, status){
           self.cards = res.data.cards;
-          //Si el usuario seleccinó un plan se crea la subscripción automaticamente
-          if (self.create_subscription_after_new_card == true){
-            self.CreateSubscription();
-          }
         },
         function(res, status){
         }
@@ -165,7 +161,10 @@
           $("#new-credit-card-modal").modal("hide");
           swal("¡Excelente!", "¡La tarjeta de crédito creada con éxito!", "success");
 
-
+          //Si el usuario seleccinó un plan se crea la subscripción automaticamente
+          if (self.create_subscription_after_new_card == true){
+            self.CreateSubscription();
+          }
         },
         function(res, status){
           self.card_loading = false;

data/app/controllers/easy_pay_u_latam/api/v1/pay_u_additional_charges_controller.rb

@@ -0,0 +1,30 @@
+module EasyPayULatam
+  class Api::V1::PayUAdditionalChargesController < ApiController
+
+    acts_as_token_authentication_handler_for User
+
+    def create
+
+      addcharge = current_user.last_payment.add_charge(params)
+
+      unless addcharge.response.blank?
+        render status: 200, json: {message: "ok"}
+      else
+        msg = addcharge.error["errorList"].blank? ? addcharge.error["description"] : addcharge.error["errorList"].to_sentence
+        render status: 411, json: {message: msg }
+      end
+    end
+
+    def destroy
+  
+      if current_user.last_payments.count > 0
+        current_user.last_payment.remove_charge(params[:charge_id])
+
+        render status: 200, json: {message: "¡Cargo extra cancelado correctamente, tu plan estará activo por el periodo que ya habías pagado!"}
+      else
+        render status: 411, json: {message: "No tienes cargos extra para cancelar"}
+      end
+
+    end
+  end
+end

data/app/controllers/easy_pay_u_latam/api/v1/pay_u_subscriptions_controller.rb

@@ -4,15 +4,14 @@ module EasyPayULatam
     acts_as_token_authentication_handler_for User
 
     def index
-      render status: 200, json: {subscriptions: current_user.all_payments.first(30)}
-      # client = RApi::Client.new current_user.pay_u_costumer_id
-      # subs = RApi::Subscription.new client
-      #
-      # unless subs.response["recurringBillList"].blank?
-      #   render status: 200, json: {subscriptions: subs.response["recurringBillList"].last(30)}
-      # else
-      #   render status: 200, json: {subscriptions: []}
-      # end
+      client = RApi::Client.new current_user.pay_u_costumer_id
+      subs = RApi::Subscription.new client
+      
+      unless subs.response["recurringBillList"].blank?
+        render status: 200, json: {subscriptions: current_user.all_payments.first(30), subscriptions_api: subs.response["recurringBillList"].last(30)}
+      else
+        render status: 200, json: {subscriptions: [], subscriptions_api: []}
+      end
     end
 
     def create

data/app/models/easy_pay_u_latam/payu_payment.rb

@@ -18,5 +18,60 @@ module EasyPayULatam
       self.status == PENDING
     end
 
+    def add_charge(params, user)
+      @payUConfig = EasyPayULatam.configuration
+
+      client = RApi::Client.new user.pay_u_costumer_id
+      addcharge = RApi::AdditionalCharge.new client, self.reference_recurring_payment
+      addcharge.params = {
+        "description" => params[:description],
+        "additionalValues" => [
+          {
+            "name" => "ITEM_VALUE",
+            "value" => params[:value],
+            "currency" => "COP"
+          },
+          {
+            "name" => "ITEM_TAX",
+            "value" => "0",
+            "currency" => "COP"
+          },
+          {
+            "name" => "ITEM_TAX_RETURN_BASE",
+            "value" => "0",
+            "currency" => "COP"
+          }
+        ]
+      }
+
+      addcharge.create!
+
+      unless addcharge.response["id"].blank?
+        self.additional_charges_data = "#{self.additional_charges_data}|#{addcharge.response["id"]}·#{Date.today}"
+      end
+
+      addcharge
+    end
+
+    def get_additional_charges
+      charges = []
+      self.additional_charges_data.split("|").each do |charge|
+        data = charge.split("·")
+        charges.push({id: data[0], date: data[1]})
+      end
+      charges
+    end
+
+    def remove_charge(id, user)
+      @payUConfig = EasyPayULatam.configuration
+
+      client = RApi::Client.new user.pay_u_costumer_id
+      addcharge = RApi::AdditionalCharge.new client, self.reference_recurring_payment
+
+      addcharge.delete id
+
+      addcharge
+    end
+
   end
 end

data/config/routes.rb

@@ -14,6 +14,7 @@ EasyPayULatam::Engine.routes.draw do
       resources :pay_u_clients, only: [:create]
       resources :pay_u_plans, only: [:index]
       resources :pay_u_subscriptions, only: [:index, :show, :create, :update, :destroy]
+      resources :pay_u_additional_charges, only: [:create, :destroy]
     end
   end
 

data/lib/easy_pay_u_latam.rb

@@ -6,6 +6,7 @@ require "easy_pay_u_latam/r_api/plan"
 require "easy_pay_u_latam/r_api/card"
 require "easy_pay_u_latam/r_api/client"
 require "easy_pay_u_latam/r_api/subscription"
+require "easy_pay_u_latam/r_api/additional_charge"
 
 module EasyPayULatam
   class << self

data/lib/easy_pay_u_latam/r_api.rb

@@ -3,7 +3,7 @@ module EasyPayULatam
     class << self
       require "base64"
       # NOTA: definir si dejar estos campos como accessors
-      attr_accessor :api_login, :api_key, :account_id, :sandbox
+      attr_accessor :api_login, :api_key, :account_id, :sandbox, :api_version
       attr_reader   :base_url
 
       # recibe un bloque inicializador de variables de configuración de payu como la
@@ -34,6 +34,7 @@ module EasyPayULatam
   #   config.api_key    = '4Vj8eK4rloUd272L48hsrarnUA'
   #   config.account_id = '512321'
   #   config.sandbox    = true
+  #   config.api_version    = "v4.3"
   # end
 
   # production
@@ -42,6 +43,7 @@ module EasyPayULatam
   #   config.api_key    = 'ZNl7g0L2H54Y9ZVn51keXS2l07'
   #   config.account_id = '762507'
   #   config.sandbox    = false
+  #   config.api_version    = "v4.3"
   # end
 
 end

data/lib/easy_pay_u_latam/r_api/additional_charge.rb

@@ -0,0 +1,42 @@
+module EasyPayULatam
+  module RApi
+    class AdditionalCharge < Request
+      attr_reader :url, :plan, :customer, :card, :sub_id
+      attr_accessor :resource, :params
+
+      def initialize(customer, sub_id)
+        @customer = customer
+        @sub_id = sub_id
+        @customer = customer.response if !customer.nil?
+        # @callback_url = callback_url
+        @params = {}
+        return if @customer.nil?
+        # load("")
+      end
+
+      def create_url
+        @url = RApi.base_url + "/rest/#{RApi.api_version}/subscriptions/#{@sub_id}/recurringBillItems"
+      end
+
+      def url
+        @url = RApi.base_url + "/rest/#{RApi.api_version}/recurringBillItems/"
+      end
+
+      def create!
+        create_url
+        super
+      end
+
+      def load(id)
+        url
+        super
+      end
+
+      def delete(id)
+        url
+        super
+      end
+
+    end
+  end
+end

data/lib/easy_pay_u_latam/r_api/card.rb

@@ -21,13 +21,13 @@ module EasyPayULatam
 
       # llena la variable local y super con la url de este recurso
       def url
-        @url ||= RApi.base_url + "/rest/v4.9/creditCards/"
+        @url ||= RApi.base_url + "/rest/#{RApi.api_version}/creditCards/"
       end
 
       # el recurso de tarjeta necesita en algunos casos alterar la URL para incluir información
       # del customer, por eso se crea este metodo con la url necesario
       def customer_url
-        @url = RApi.base_url + "/rest/v4.9/customers/#{@customer['id']}/creditCards/"
+        @url = RApi.base_url + "/rest/#{RApi.api_version}/customers/#{@customer['id']}/creditCards/"
       end
 
       # se sobreescribe el metodo crear de request

data/lib/easy_pay_u_latam/r_api/client.rb

@@ -15,7 +15,7 @@ module EasyPayULatam
 
       # url base
       def url
-        @url = RApi.base_url + '/rest/v4.9/customers/'
+        @url = RApi.base_url + "/rest/#{RApi.api_version}/customers/"
       end
 
       private

data/lib/easy_pay_u_latam/r_api/invoice.rb

@@ -34,7 +34,7 @@ module PayuLatam
     end
 
     def url
-      @url = PayuLatam.base_url + '/rest/v4.9/recurringBill'
+      @url = PayuLatam.base_url + "/rest/#{RApi.api_version}/recurringBill"
     end
 
     def customer_url
@@ -50,4 +50,4 @@ module PayuLatam
       @url = url "?customerId=#{@id}&dateBegin=#{@dateBegin}&dateFinal=#{@dateFinal}"
     end
   end
-end
+end

data/lib/easy_pay_u_latam/r_api/plan.rb

@@ -28,7 +28,7 @@ module EasyPayULatam
       end
 
       def url
-        @url = RApi.base_url + '/rest/v4.9/plans/'
+        @url = RApi.base_url + "/rest/#{RApi.api_version}/plans/"
       end
 
       private

data/lib/easy_pay_u_latam/r_api/subscription.rb

@@ -14,11 +14,11 @@ module EasyPayULatam
       end
 
       def invoice_url
-        @url = RApi.base_url + "/rest/v4.9/recurringBill?customerId=#{@customer['id']}"
+        @url = RApi.base_url + "/rest/#{RApi.api_version}/recurringBill?customerId=#{@customer['id']}"
       end
 
       def url
-        @url = RApi.base_url + '/rest/v4.9/subscriptions/'
+        @url = RApi.base_url + "/rest/#{RApi.api_version}/subscriptions/"
       end
 
       def create!
@@ -31,7 +31,7 @@ module EasyPayULatam
         super
       end
 
-      def delete(token)
+      def delete(id)
         url
         super
       end

data/lib/easy_pay_u_latam/version.rb

@@ -1,3 +1,3 @@
 module EasyPayULatam
-  VERSION = '0.1.21'
+  VERSION = '0.1.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_pay_u_latam
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.28
 platform: ruby
 authors:
 - DEVPENGUIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-assets-sweetalert2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sweet-alert2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +160,7 @@ files:
 - app/assets/stylesheets/easy_pay_u_latam/styles.css
 - app/assets/stylesheets/easy_pay_u_latam/subscriptions/application.scss
 - app/assets/stylesheets/easy_pay_u_latam/subscriptions/card.css
+- app/controllers/easy_pay_u_latam/api/v1/pay_u_additional_charges_controller.rb
 - app/controllers/easy_pay_u_latam/api/v1/pay_u_cards_controller.rb
 - app/controllers/easy_pay_u_latam/api/v1/pay_u_clients_controller.rb
 - app/controllers/easy_pay_u_latam/api/v1/pay_u_payments_controller.rb
@@ -184,6 +199,7 @@ files:
 - lib/easy_pay_u_latam/Configuration.rb
 - lib/easy_pay_u_latam/engine.rb
 - lib/easy_pay_u_latam/r_api.rb
+- lib/easy_pay_u_latam/r_api/additional_charge.rb
 - lib/easy_pay_u_latam/r_api/card.rb
 - lib/easy_pay_u_latam/r_api/client.rb
 - lib/easy_pay_u_latam/r_api/invoice.rb