Oscar José Nuñez Chávez пре 5 година
родитељ
комит
ff8511bad9

+ 2 - 2
src/app/components/instruments/futuros/futuros.component.html

@@ -661,7 +661,7 @@
 
           <div class="col-sm-4">
             <h4>Rendimiento:</h4>
-            <div class="field">$USD {{ rendimiento | number: "1.2-4" }} %</div>
+            <div class="field">{{ rendimiento | number: "1.2-4" }} %</div>
           </div>
 
           <div class="col-sm-4">
@@ -961,7 +961,7 @@
         <div class="col-sm-4">
           <h4>Rendimiento:</h4>
           <div class="field">
-            $USD {{ instrument_work_summary.rendimiento | number: "1.2-4" }}
+            {{ instrument_work_summary.rendimiento | number: "1.2-4" }}%
           </div>
         </div>
 

+ 6 - 6
src/app/components/instruments/opciones/opciones.component.html

@@ -661,7 +661,7 @@
 
           <div class="col-sm-4">
             <h4>Rendimiento:</h4>
-            <div class="field">$USD {{ rendimiento | number: "1.2-4" }} %</div>
+            <div class="field">{{ rendimiento | number: "1.2-4" }} %</div>
           </div>
 
           <div class="col-sm-4">
@@ -899,8 +899,8 @@
           operation_result == true &&
           (instrument_work_summary.corto == 0 ||
             instrument_work_summary.completo == 1 ||
-              (instrument_work_summary.valor_pagado != '' &&
-                instrument_work_summary.valor_recibido != ''))
+            (instrument_work_summary.valor_pagado != '' &&
+              instrument_work_summary.valor_recibido != ''))
         "
       >
         <div class="col-sm-4">
@@ -971,7 +971,7 @@
         <div class="col-sm-4">
           <h4>Rendimiento:</h4>
           <div class="field">
-            $USD {{ instrument_work_summary.rendimiento | number: "1.2-4" }}
+            {{ instrument_work_summary.rendimiento | number: "1.2-4" }}%
           </div>
         </div>
 
@@ -1049,8 +1049,8 @@
           operation_result == true &&
           (instrument_work_summary.corto == 1 ||
             instrument_work_summary.completo == 1 ||
-              (instrument_work_summary.valor_pagado != '' &&
-                instrument_work_summary.valor_recibido != ''))
+            (instrument_work_summary.valor_pagado != '' &&
+              instrument_work_summary.valor_recibido != ''))
         "
       >
         <div class="col-sm-4">

+ 30 - 10
src/app/components/investment-proposals/payment-info/payment-info.component.ts

@@ -112,17 +112,37 @@ export class PaymentInfoComponent implements OnInit {
         res => {
           this.inversionCode = res["result"]["codigo_inversion"];
 
-          if (res["result"]["id_inversion_instrumento"]["instrumento"]["monto_inversion"]!=undefined){
-            this.inversionAmount = res["result"]["id_inversion_instrumento"]["instrumento"]["monto_inversion"];
-          }
-          else if(res["result"]["id_inversion_instrumento"]["instrumento"]["total_pagar"]!=undefined){
-            this.inversionAmount = res["result"]["id_inversion_instrumento"]["instrumento"]["total_pagar"];
-          }
-          else if(res["result"]["id_inversion_instrumento"]["instrumento"]["monto_pagar"]!=undefined){
-            this.inversionAmount = res["result"]["id_inversion_instrumento"]["instrumento"]["monto_pagar"];
+          if (
+            res["result"]["id_inversion_instrumento"]["instrumento"][
+              "monto_inversion"
+            ] != undefined
+          ) {
+            this.inversionAmount =
+              res["result"]["id_inversion_instrumento"]["instrumento"][
+                "monto_inversion"
+              ];
+          } else if (
+            res["result"]["id_inversion_instrumento"]["instrumento"][
+              "total_pagar"
+            ] != undefined
+          ) {
+            this.inversionAmount =
+              res["result"]["id_inversion_instrumento"]["instrumento"][
+                "total_pagar"
+              ];
+          } else if (
+            res["result"]["id_inversion_instrumento"]["instrumento"][
+              "monto_pagar"
+            ] != undefined
+          ) {
+            this.inversionAmount =
+              res["result"]["id_inversion_instrumento"]["instrumento"][
+                "monto_pagar"
+              ];
           }
           this.investmentProposalForm.setValue({
-            monto: this.inversionAmount,
+            monto:
+              Math.round((this.inversionAmount + Number.EPSILON) * 100) / 100,
             tipo_pago: "",
             cuenta_bancaria: "",
             fecha_vencimiento: "",
@@ -255,7 +275,7 @@ export class PaymentInfoComponent implements OnInit {
 
               this.reviewProposal["notificar"] = array.toString();
               this.paymentObject = {
-                monto: this.investmentProposalForm.value.monto,
+                monto: this.inversionAmount,
                 id_tipo_pago: +this.investmentProposalForm.value.tipo_pago,
                 id_cuenta_bancaria: +this.investmentProposalForm.value
                   .cuenta_bancaria,