easy_pay_u_latam 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 431da6ab81f9fbfb68fff696a12f62d37d182dcea79bea4ea8bba97edf2f7354
-  data.tar.gz: 8580e03b403f3ae9ac4a2b81dfb2ea73f926f52441b61b52050b14288a7c21bf
+  metadata.gz: a7488eb02bd73a2e0a9e1985adeb73b08a077dc2fec24f84e8d1c6cefdc0f09f
+  data.tar.gz: 1037ea884d71536c6d3f1f589b1fd234aff545113b4321747d443d3560cf8441
 SHA512:
-  metadata.gz: cf9e06944f86d1d9151aa6ae855a6d765b3230dd3da2626acc742de19cdf703129105ea9219147fbb7165fa9f20465b103fd60be766efb332efce96911bc35fe
-  data.tar.gz: e233c6db2aadad6e0bf858d7845bf691b8c58d8b41b5381150fdba03ac70075dd65bb9519abe717765edb35a851d951a04ccfb78b0cf2313207fc076c1795767
+  metadata.gz: 690b7e42e7763aa14aa38a2cb8b19a5fdce8acccdc4f6e6c030527fc4ef42967ebb412743ea5ff9dc58d30ab04f3d2cdb52498b1918d71a16a97c38f9ecf8526
+  data.tar.gz: 66907a1086e3c0828a9e454349b1c64067d08f63b5acf841a737d5eb218e02d63f7493516daedb4cd7ba45c39ab81de1a68b1077d7162120c0820b076b4cabf4

data/README.md

@@ -68,6 +68,15 @@ 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
 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;
@@ -326,8 +325,8 @@
           self.subscription_loading = false;
           //Mirar si se muestra alerta y se fuerza un refresh
           //O recirbir respuesta json y actualizar variables necesarias desde el API
-          swal("Información", "Estamos procesando tu pago, te llegará un correo con el estado de la transacción", "success");
-
+          swal("Información", "Estamos procesando tu pago", "success");
+          window.location.reload();
         },
         function(res, status){
           self.subscription_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,47 @@ module EasyPayULatam
       self.status == PENDING
     end
 
+    def add_charge(params)
+      @payUConfig = EasyPayULatam.configuration
+
+      client = RApi::Client.new current_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!
+
+      addcharge
+    end
+
+    def remove_charge(id)
+      @payUConfig = EasyPayULatam.configuration
+
+      client = RApi::Client.new current_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/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/v4.9/subscriptions/#{@sub_id}/recurringBillItems}"
+      end
+
+      def url
+        @url = RApi.base_url + "/rest/v4.9/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/subscription.rb

@@ -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.22'
+  VERSION = '0.1.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_pay_u_latam
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - DEVPENGUIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2020-09-15 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