easy_pay_u_latam 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c08212451cfd2aeb7cb163142f777adc2c2dc450be6b67e5351d5460c8e8cb90
-  data.tar.gz: f3b0243c7acb9fe01469785e971999ef88c27958eed7977821ad9db7c7b9c8f7
+  metadata.gz: 92312a4faad16ed20b911633516d52cdf80d0aed11e76244c99a59d6d31a3ce6
+  data.tar.gz: b97b7aaac62e33efd4cb2c8eba3fd88909397c6fd80b3f79457bc2d47abaa03e
 SHA512:
-  metadata.gz: 0451a45e206af40bfa978b331e81e7cbdb76bc7969c23d16ca6c19776defcef73fada8b6d1c0ebe91e525548038fce254ec91c0be8ce7fcf3d0854cfb41a6630
-  data.tar.gz: 1f478315511728b34dfd1ede054ef7a25dd75156fd6cc1361d93e3ca6334a7dd1876db58533ec83d0c044d752bd43a694687b9141cce9c937f5386596729041b
+  metadata.gz: c96fb55e3e4b6cc9724213d52fb0351eafe7a559e3c75f2e2b4418b36bf501a7d2d24fa0d0a716936fe7dd2c399f09b0f2585d8b754a29ce80c346beec49bb0b
+  data.tar.gz: 3887f13d76debc527dc211c0375d57beb0e98445b263b5d55cf80965e55d0138d28a74ed10bef569f6d390a46b1ab0fc60e71b403608f7c9bfa91c12f049bad4

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

@@ -7,6 +7,8 @@
     //Atributos de Planes
     this.actual_plan = null;
     this.selected_plan = null;
+    this.last_payment = null;
+    this.is_buyer = false;
     this.plans = [];
 
     //Atributos de Subscripciones
@@ -37,9 +39,13 @@
       width: 500 //optional
     };
 
-    this.init = function(uuid, token, plans){
+    this.init = function(uuid, token, plans, is_buyer, last_payment, actual_plan){
       this.user_uuid = uuid;
       this.user_token = token;
+      this.is_buyer = is_buyer;
+      this.last_payment = last_payment;
+      this.actual_plan = actual_plan;
+
       this.ClearCard();
       this.GetClient();
       //No tengo ni idea porque me toco hacer eso pero sin el timeout simplemente el ng-repeat no renderiza plans
@@ -296,6 +302,7 @@
         subscription: {
           quantity: "1",
           installments: "1",
+          immediatePayment: true,
           trialDays: "15",
           customer: {
             id: "",
@@ -318,9 +325,12 @@
           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", "success");
+          window.location.reload();
         },
         function(res, status){
           self.subscription_loading = false;
+          swal("Información", res.data.message, "warning");
         }
       );
     }
@@ -348,11 +358,14 @@
             $http.delete("/easy_pay_u_latam/api/v1/pay_u_subscriptions/0000.json", {params: params}).then(
               function(res, status){
                 self.subscription_loading = false;
+                swal("Información", res.data.message, "success");
+                window.location.reload();
                 //Mirar si se muestra alerta y se fuerza un refresh
                 //O recirbir respuesta json y actualizar variables necesarias desde el API
               },
               function(res, status){
                 self.subscription_loading = false;
+                swal("Información", res.data.message, "warning");
               }
             );
           });

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

@@ -8,7 +8,7 @@ module EasyPayULatam
       cards = RApi::Card.new client
       unless cards.response["creditCardList"].blank?
         if cards.response["creditCardList"].count == 1
-          if current_user.payu_default_card = cards.response["creditCardList"][0]["token"]
+          if current_user.payu_default_card != cards.response["creditCardList"][0]["token"]
             current_user.update_attribute :payu_default_card, cards.response["creditCardList"][0]["token"]
           end
         end
@@ -43,8 +43,9 @@ module EasyPayULatam
       #validat si tiene subscripciones y actualizar subscricion
 
       subs = RApi::Subscription.new client
+
       unless subs.response.blank?
-        unless subs.response["creditCardList"].empty?
+        if !subs.response["creditCardList"].nil? && !subs.response["creditCardList"].empty?
           res = subs.update({"creditCardToken": params[:id]})
 
           unless subs.response.blank?

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

@@ -4,24 +4,35 @@ module EasyPayULatam
     acts_as_token_authentication_handler_for User
 
     def index
-      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
+      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
     end
 
     def create
+      @payUConfig = EasyPayULatam.configuration
+      generate_payment(params[:subscription][:plan][:planCode])
+
       client = RApi::Client.new current_user.pay_u_costumer_id
       subs = RApi::Subscription.new client
       subs.params = params[:subscription].as_json
       subs.params["customer"]["id"] = current_user.pay_u_costumer_id
       subs.params["customer"]["creditCards"][0]["token"] = current_user.payu_default_card
+
+      if !current_user.last_payment.nil? && current_user.last_payment.end_date > Date.today
+        subs.params["trialDays"] = (current_user.last_payment.end_date - Date.today).to_i
+      end
+
+      subs.params["notifyUrl"] = "#{@payUConfig.get_root_url}/easy_pay_u_latam/api/v1/pay_u_payments/#{ @payu_payment.id}/confirmation.json?user_id=#{current_user.id}"
+
       response = subs.create!
-      binding.pry
+
       unless subs.response.blank?
         render status: 200, json: {message: "ok"}
       else
@@ -40,17 +51,51 @@ module EasyPayULatam
     def destroy
       client = RApi::Client.new current_user.pay_u_costumer_id
       subs = RApi::Subscription.new client
-      unless subs.response.blank?
-        unless subs.response["creditCardList"].empty?
-          res = subs.delete params[:id]
 
-          render status: 200, json: {message: res["description"]}
-        else
-          render status: 411, json: {message: "No tienes subscripciones para cancelar"}
+      if current_user.last_payments.count > 0
+        current_user.last_payments.each do |sub|
+          res = subs.delete sub.reference_recurring_payment
+          sub.update_attribute :response_message_pol, "CANCELLED BY USER"
+          sub.update_attribute :state_pol, "-1"
         end
+
+        render status: 200, json: {message: "¡Subscripción cancelada correctamente, tu plan estará activo por el periodo que ya habías pagado!"}
       else
         render status: 411, json: {message: "No tienes subscripciones para cancelar"}
       end
+
+    end
+
+    def generate_payment(plan_code)
+      plan = Plan.actives.find_by_payu_plan_code plan_code
+      # period_moths = 1 if plan.interval.downcase == "day"
+      period_moths = 1 if plan.interval.downcase == "month"
+      period_moths = 6 if plan.interval.downcase == "semester"
+      period_moths = 12 if plan.interval.downcase == "year"
+
+      current_user.update_attribute(:temp_plan_id, plan.id)
+
+      period = "del día" if plan.interval.downcase == "day"
+      period = "del año" if plan.interval.downcase == "year"
+      period = "del semestre" if plan.interval.downcase == "semester"
+      period = "del mes" if plan.interval.downcase == "month"
+
+      # end_date = Date.today + 1.day if plan.interval.downcase == "day"
+      end_date = Date.today + 1.month if plan.interval.downcase == "month"
+      end_date = Date.today + 6.months if plan.interval.downcase == "semester"
+      end_date = Date.today + 1.year if plan.interval.downcase == "year"
+
+      @payu_payment = EasyPayULatam::PayuPayment.create(
+        # amount: plan["value_month"],
+        amount: plan["value_#{plan.interval.downcase}"],
+        currency: "COP",
+        period: period_moths,
+        plan_id: plan.id,
+        user_id: current_user.id,
+        description: "Pago #{plan.name} #{period} UPICK",
+        start_date: Date.today,
+        end_date: end_date
+      )
     end
   end
 end

data/app/views/easy_pay_u_latam/pay_u_payments/_dashboard.html.erb

@@ -1,7 +1,7 @@
 <%= stylesheet_link_tag    "easy_pay_u_latam/subscriptions/application", media: "all" %>
 <%= javascript_include_tag "easy_pay_u_latam/subscriptions/application" %>
 <div id="easy_pay_u_latam">
-  <div ng-controller="SubscriptionsController as ssCtrl" ng-init="ssCtrl.init('<%= current_user.email %>', '<%= current_user.authentication_token %>', <%= Plan.actives.select(:id, :name, :value_month, :description, :payu_plan_code, :payu_plan_id).to_json%>)">
+  <div ng-controller="SubscriptionsController as ssCtrl" ng-init="ssCtrl.init('<%= current_user.email %>', '<%= current_user.authentication_token %>', <%= Plan.actives.select(:id, :name, :value_month, :description, :payu_plan_code, :payu_plan_id).to_json%>, <%= current_user.is_buyer?%>, <%= current_user.last_payment.to_json%>, <%= current_user.plan.to_json%>)">
     <%= render "easy_pay_u_latam/pay_u_payments/subscriptions/none" %>
     <%= render "easy_pay_u_latam/pay_u_payments/plans/list" %>
     <%= render "easy_pay_u_latam/pay_u_payments/subscriptions/actual" %>

data/app/views/easy_pay_u_latam/pay_u_payments/cards/_list.html.erb

@@ -8,10 +8,10 @@
       <%= render "easy_pay_u_latam/pay_u_payments/cards/form" %>
     </div>
     <div class="col-md-12">
-      <div class="alert alert-warning" ng-if="ssCtrl.cards.length == 0">
+      <div class="alert alert-warning" ng-show="ssCtrl.cards.length == 0">
         <strong>Información: </strong> No tienes medio de pagos creados, da click en <b>Nueva tarjeta</b> para crearlos.
       </div>
-      <table class="table" ng-if="ssCtrl.cards.length > 0">
+      <table class="table" ng-show="ssCtrl.cards.length > 0">
         <tr>
           <th>
             Número de tajeta
@@ -38,7 +38,7 @@
             {{card.type}}
           </td>
           <td class="text-center">
-            <button type="button" class="text-btn pull-right" ng-click="ssCtrl.DeleteCard(card)">
+            <button type="button" class="text-btn pull-right" ng-click="ssCtrl.DeleteCard(card)" ng-if="card.token != ssCtrl.user_default_card">
               <i class="far fa-trash-alt"></i>
               Eliminar
             </button>

data/app/views/easy_pay_u_latam/pay_u_payments/subscriptions/_actual.html.erb

@@ -1,4 +1,4 @@
-<div class="my-profile-info-text">
+<div class="my-profile-info-text" ng-hide="ssCtrl.actual_plan == null">
   <h2 class="h4">
     <i class="fas fa-medal icon-full-blue"></i> Membresía y facturación
   </h2>
@@ -7,23 +7,29 @@
     <div class="col-md-8">
       <p class="h6">
         Plan actual:
-        <span ng-if="ssCtrl.subscription_loading == false">
+        <span ng-show="ssCtrl.subscription_loading != true">
           {{ssCtrl.actual_plan.name}}
+          <small ng-show="ssCtrl.last_payment.state_pol == '4'">
+            (Renovación automática)
+          </small>
+          <small ng-show="ssCtrl.last_payment.state_pol == '-1'">
+            (Renovación manual)
+          </small>
         </span>
-        <span ng-if="ssCtrl.subscription_loading == true">
+        <span ng-show="ssCtrl.subscription_loading == true">
           <i class="fas fa-circle-notch fa-spin vertical-middle"></i>
         </span>
       </p>
       <p class="h6">
-        Fecha de inicio:
+        Fecha de inicio: {{ssCtrl.last_payment.start_date}}
       </p>
       <p class="h6">
-        Fecha de corte:
+        Fecha de corte: {{ssCtrl.last_payment.end_date}}
       </p>
-      <p class="h6">
-        Medio de pago: **** **** **** 7289
+      <p class="h6" ng-show="ssCtrl.last_payment.number_card != null">
+        Medio de pago: {{ssCtrl.last_payment.number_card}}
       </p>
-      <p class="h6" ng-if="ssCtrl.selected_plan != null">
+      <p class="h6" ng-show="ssCtrl.selected_plan != null">
         <span class="label label-info" style="font-size: 14px;">
           Nuevo plan seleccionado: {{ssCtrl.selected_plan.name}}
         </span>
@@ -36,16 +42,16 @@
     </div>
     <div class="col-md-4">
       <div class="btn-group-vertical">
-        <button type="button" class="btn secundary-btn pull-right" style="font-size: 16px; margin-right: 15px" ng-click="ssCtrl.ChangePlan();">
+        <!-- <button type="button" class="btn secundary-btn pull-right" style="font-size: 16px; margin-right: 15px" ng-click="ssCtrl.ChangePlan();">
           <span>Cambiar plan</span>
-        </button>
+        </button> -->
         <!-- <button type="button" class="btn secundary-btn pull-right" style="font-size: 16px; margin-right: 15px">
           <span>Actualizar información de pagos</span>
         </button>
         <button type="button" class="btn secundary-btn pull-right" style="font-size: 16px; margin-right: 15px">
           <span>Detalles de facturación</span>
         </button> -->
-        <button type="button" class="btn secundary-btn pull-right" style="font-size: 16px; margin-right: 15px" ng-if="ssCtrl.actual_plan != null" ng-click="ssCtrl.DeleteSubscription();">
+        <button type="button" class="btn secundary-btn pull-right" style="font-size: 16px; margin-right: 15px" ng-show="ssCtrl.actual_plan != null" ng-click="ssCtrl.DeleteSubscription();">
           <span>Cancelar membresía</span>
         </button>
       </div>

data/app/views/easy_pay_u_latam/pay_u_payments/subscriptions/_list.html.erb

@@ -5,10 +5,10 @@
   <br/>
   <div class="row">
     <div class="col-md-12">
-      <div class="alert alert-warning" ng-if="ssCtrl.subscriptions.length == 0">
+      <div class="alert alert-warning" ng-show="ssCtrl.subscriptions.length == 0">
         <strong>Información: </strong> Aún no tienes facturas para mostrar.
       </div>
-      <table class="table" ng-if="ssCtrl.subscriptions.length > 0">
+      <table class="table" ng-show="ssCtrl.subscriptions.length > 0">
         <tr>
           <th>
             Orden Id
@@ -28,10 +28,10 @@
         </tr>
         <tr ng-repeat="sub in ssCtrl.subscriptions">
           <td>
-            {{sub.orderId}} {{sub.subscriptionId}}
+            {{sub.reference_code}}
           </td>
           <td class="text-center">
-            {{sub.state}}
+            {{sub.response_message_pol}}
           </td>
           <td class="text-right">
             {{sub.amount | myCurrency}}
@@ -40,7 +40,7 @@
             {{sub.currency}}
           </td>
           <td class="text-center">
-            {{ssCtrl.IntToDate(sub.dateCharge)}}
+            {{sub.created_at}}
           </td>
         </tr>
       </table>

data/db/migrate/20170929211207_create_easy_pay_u_latam_payu_payments.rb

@@ -50,7 +50,7 @@ class CreateEasyPayULatamPayuPayments < ActiveRecord::Migration[5.0]
       t.integer :attempts
       t.string :merchant_id
       t.string :exchange_rate
-      t.string :ip
+      t.string :reference_recurring_payment
 
       t.timestamps
     end

data/lib/easy_pay_u_latam/r_api/subscription.rb

@@ -10,7 +10,7 @@ module EasyPayULatam
         # @callback_url = callback_url
         @params = {}
         return if @customer.nil?
-        load("")
+        # load("")
       end
 
       def invoice_url

data/lib/easy_pay_u_latam/version.rb

@@ -1,3 +1,3 @@
 module EasyPayULatam
-  VERSION = '0.1.16'
+  VERSION = '0.1.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_pay_u_latam
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - DEVPENGUIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails