diff --git a/src/js/controller.js b/src/js/controller.js
index 80b0702..86e8ceb 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -9,14 +9,15 @@ angular.module('focaModalPrecioCondicion')
             'focaModalService',
             'focaModalPrecioCondicionService',
             'idListaPrecio',
+            'idCliente',
             function (
                 $timeout, $filter, $scope, $uibModal, $uibModalInstance,
-                focaModalService, focaModalPrecioCondicionService, idListaPrecio
+                focaModalService, focaModalPrecioCondicionService, idListaPrecio, idCliente
             ) {
                 $scope.plazos = [{ dias: 0 }];
                 $scope.editingPlazo = false;
                 $scope.openModalListaDePrecios = false;
-                $scope.chosenClientList = true;
+                $scope.associatedList = true;
                 $scope.listaDePreciosAlternativa = null;
 
                 onInit();
@@ -27,7 +28,14 @@ angular.module('focaModalPrecioCondicion')
                         .then(function (res) {
                             console.log("Lista de precios", res);
                             $scope.listaDePreciosAsociada = res.data[0];
-                        });
+                        })
+                        .catch(function (e) { console.log(e) });
+                    focaModalPrecioCondicionService.getPlazosByIdCliente(idCliente)
+                        .then(function (res) {
+                            console.log(res);
+                            $scope.plazos = res.data;
+                        })
+                        .catch(function (e) { console.log(e) });
                 }
 
                 //#region Metodos para la lista de precios
@@ -51,7 +59,7 @@ angular.module('focaModalPrecioCondicion')
                                     }
                                 ],
                             }).then(function (res) {
-                                $scope.chosenClientList = false;
+                                $scope.associatedList = false;
                                 $scope.listaDePreciosAlternativa = res;
                                 console.log(res);
                             }).catch(function (e) {
@@ -60,7 +68,7 @@ angular.module('focaModalPrecioCondicion')
                         });
                 };
                 $scope.selectListaDePrecios = function (listaDePrecios) {
-                    $scope.chosenClientList = true;
+                    $scope.associatedList = true;
                 };
                 $scope.verListaProductos = function (id) {
                     var modalInstance = $uibModal.open(
@@ -88,6 +96,9 @@ angular.module('focaModalPrecioCondicion')
                 $scope.closeModalPrecioCondicion = function () {
                     $uibModalInstance.dismiss('cancel');
                 };
+                $scope.guardarPrecioCondicion = function () {
+                    $uibModalInstance.close(!$scope.associatedList ? $scope.listaDePreciosAsociada : $scope.listaDePreciosAlternativa);
+                }
                 //#endregion
 
                 //#region Metodos para los plazos
diff --git a/src/js/service.js b/src/js/service.js
index e6084a2..4c6ebc9 100644
--- a/src/js/service.js
+++ b/src/js/service.js
@@ -20,6 +20,9 @@ angular.module('focaModalPrecioCondicion')
                 },
                 getAllListaPrecio: function () {
                     return $http.get(API_ENDPOINT.URL + '/lista-precio');
+                },
+                getPlazosByIdCliente: function (id) {
+                    return $http.get(API_ENDPOINT.URL + '/plazo-pago/cliente/' + id);
                 }
             };
         }
diff --git a/src/views/modal-precio-condicion.html b/src/views/modal-precio-condicion.html
index edfefc2..47b4187 100644
--- a/src/views/modal-precio-condicion.html
+++ b/src/views/modal-precio-condicion.html
@@ -1,106 +1,113 @@
-<div>
-    <div class="modal-header py-1">
-        <div class="row w-100">
-            <div class="col-lg-6">
-                <h5 class="modal-title my-1">Precio-Condición</h5>
-            </div>
+<div class="modal-header py-1">
+    <div class="row w-100">
+        <div class="col-lg-6">
+            <h5 class="modal-title my-1">Precio-Condición</h5>
         </div>
     </div>
-    <div class="modal-body" id="modal-body">
-        <div ng-show="!ingreso">
-            <div class="row" ng-show="listaDePreciosAsociada.length == 0">
-                <div class="col">
-                    No se encontraron resultados.
-                </div>
+</div>
+<div class="modal-body" id="modal-body">
+    <div ng-show="!ingreso">
+        <div class="row" ng-show="listaDePreciosAsociada.length == 0">
+            <div class="col">
+                No se encontraron resultados.
             </div>
-            <div class="row px-2">
-                <div class="col-lg-6">
-                    <div class="row border-top py-2">
-                        <div class="col-lg-9 col-9">Lista asociada al cliente</div>
-                        <div class="col-lg-3 col-3 text-center">
-                            <button
-                                ng-class="{'btn-primary': chosenClientList, 'btn-default': !chosenClientList}"
-                                class="btn btn-sm p-1"
-                                ng-click="selectListaDePrecios(listaDePreciosAsociada)">
-                                <span class="fa fa-circle-thin"></span>
-                            </button>
-                        </div>
+        </div>
+        <div class="row px-2">
+            <div class="col-lg-6">
+                <div class="row border-top py-2">
+                    <div class="col-lg-9 col-9">Lista asociada al cliente</div>
+                    <div class="col-lg-3 col-3 text-center">
+                        <button
+                            ng-class="{'btn-primary': associatedList, 'btn-default': !associatedList}"
+                            class="btn btn-sm p-1"
+                            ng-click="selectListaDePrecios(listaDePreciosAsociada)">
+                            <span class="fa fa-circle-thin"></span>
+                        </button>
                     </div>
-                    <div class="row align-items-center pb-2">
-                        <div class="col-lg-2 col-2 text-center" ng-bind="listaDePreciosAsociada.ID"></div>
-                        <div class="col-lg-7 col-7" ng-bind="listaDePreciosAsociada.DES"></div>
-                        <div class="col-lg-3 col-3 text-center">
-                            <button ng-click="verListaProductos(listaDePreciosAsociada.ID)" class="btn btn-sm p-1">
-                                <span class="fa fa-eye"></span>
-                            </button>
-                        </div>
+                </div>
+                <div class="row align-items-center pb-2">
+                    <div class="col-lg-2 col-2 text-center" ng-bind="listaDePreciosAsociada.ID"></div>
+                    <div class="col-lg-7 col-7" ng-bind="listaDePreciosAsociada.DES"></div>
+                    <div class="col-lg-3 col-3 text-center">
+                        <button ng-click="verListaProductos(listaDePreciosAsociada.ID)" class="btn btn-sm p-1">
+                            <span class="fa fa-eye"></span>
+                        </button>
                     </div>
-                    <div class="row border-top py-2">
-                        <div class="col-lg-9 col-9">Trabajar con otra lista</div>
-                        <div class="col-lg-3 col-3 text-center">
-                            <button
-                                ng-class="{'btn-primary': !chosenClientList, 'btn-default': chosenClientList}"
-                                class="btn btn-sm btn-default p-1"
-                                ng-click="openListaDePrecios()">
-                                <span class="fa fa-circle-thin"></span>
-                            </button>
-                        </div>
+                </div>
+                <div class="row border-top py-2">
+                    <div class="col-lg-9 col-9">Trabajar con otra lista</div>
+                    <div class="col-lg-3 col-3 text-center">
+                        <button
+                            ng-class="{'btn-primary': !associatedList, 'btn-default': associatedList}"
+                            class="btn btn-sm btn-default p-1"
+                            ng-click="openListaDePrecios()">
+                            <span class="fa fa-circle-thin"></span>
+                        </button>
                     </div>
-                    <div ng-show="listaDePreciosAlternativa != null" class="row align-items-center pb-1">
-                        <div class="col-lg-2 col-2 text-center" ng-bind="listaDePreciosAlternativa.ID"></div>
-                        <div class="col-lg-7 col-7" ng-bind="listaDePreciosAlternativa.DES"></div>
-                        <div class="col-lg-3 col-3 text-center">
-                            <button ng-click="verListaProductos(listaDePreciosAlternativa.ID)" class="btn btn-sm p-1">
-                                <span class="fa fa-eye"></span>
-                            </button>
-                        </div>
+                </div>
+                <div ng-show="listaDePreciosAlternativa != null" class="row align-items-center pb-1">
+                    <div class="col-lg-2 col-2 text-center" ng-bind="listaDePreciosAlternativa.ID"></div>
+                    <div class="col-lg-7 col-7" ng-bind="listaDePreciosAlternativa.DES"></div>
+                    <div class="col-lg-3 col-3 text-center">
+                        <button ng-click="verListaProductos(listaDePreciosAlternativa.ID)" class="btn btn-sm p-1">
+                            <span class="fa fa-eye"></span>
+                        </button>
                     </div>
                 </div>
-                <div class="col">
-                    <div class="row border-bottom py-1">
-                        <div class="col text-center font-weight-bold">Plazos</div>
+            </div>
+            <div class="col">
+                <div class="row border-bottom py-1">
+                    <div class="col text-center font-weight-bold">Plazos</div>
+                </div>
+                <div ng-if="!editingPlazo" class="row align-items-center justify-content-end py-2">
+                    <div 
+                        class="col-lg-9 col-9 text-center"
+                        ng-repeat="plazo in plazos">
+                        {{plazo.dias}},
                     </div>
-                    <div ng-if="!editingPlazo" class="row align-items-center justify-content-end py-2">
-                        <div class="col-lg-9 col-9 text-center">300, 254, 215, 265, 300, 300</div>
-                        <div class="col-lg-3 col-3">
-                            <button class="btn btn-sm text-center" ng-click="editPlazo()">
-                                <span class="fa fa-pencil"></span>
-                            </button>
-                        </div>
+                    <div class="col-lg-9 col-9 text-center" ng-if="plazos.length == 0">
+                            No hay plazos cargados.
                     </div>
-                    <div ng-if="editingPlazo" class="row align-items-center justify-content-end py-2">
-                        <div class="col-2 col-sm-2 px-2" ng-repeat="plazo in plazos" ng-show="plazos.length > 0">                        
-                            <input
-                                type="text"
-                                class="form-control form-control-sm text-center"
-                                ng-model="plazo.dias"
-                                limite-numeros-max="3"
-                                ng-keyup="validateMinMax(plazo, 0, 365)"
-                                select-on-click
-                                teclado-virtual
-                                foca-tipo-input
-                                solo-positivos>
-                        </div>
-                        <div class="col-lg-2 col-2 text-center">
-                            <button
-                                class="btn btn-outline-debo" 
-                                ng-click="addMorePlazos()"
-                                ng-disabled="plazos.length == 4">
-                                <span class="fa fa-plus"></span>
-                            </button>
-                        </div>
-                        <div class="col-lg-2 col-2 text-center">
-                            <button class="btn btn-primary">
-                                <span class="fa fa-save"></span>
-                            </button>
-                        </div>
+                    <div class="col-lg-3 col-3">
+                        <button class="btn btn-sm text-center" ng-click="editPlazo()">
+                            <span ng-class="{'fa-pencil': plazos.length > 0, 'fa-plus': plazos.length == 0}" class="fa"></span>
+                        </button>
+                    </div>
+                </div>
+                <div ng-if="editingPlazo" class="row align-items-center justify-content-end py-2">
+                    <div class="col-2 col-sm-2 px-2" ng-repeat="plazo in plazos" ng-show="plazos.length > 0">                        
+                        <input
+                            type="text"
+                            class="form-control form-control-sm text-center"
+                            ng-model="plazo.dias"
+                            limite-numeros-max="3"
+                            ng-keyup="validateMinMax(plazo, 0, 365)"
+                            select-on-click
+                            teclado-virtual
+                            foca-tipo-input
+                            solo-positivos>
+                    </div>
+                    <div class="col-lg-2 col-2 text-center">
+                        <button
+                            class="btn btn-outline-debo" 
+                            ng-click="addMorePlazos()"
+                            ng-disabled="plazos.length == 4">
+                            <span class="fa fa-plus"></span>
+                        </button>
+                    </div>
+                    <div class="col-lg-2 col-2 text-center">
+                        <button class="btn btn-primary">
+                            <span class="fa fa-save"></span>
+                        </button>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-    <div class="modal-footer py-2">
-        <button class="btn btn-sm btn-secondary" type="button" ng-click="closeModalPrecioCondicion()">Cerrar
-        </button>
-    </div>
-</div>
\ No newline at end of file
+</div>
+<div class="modal-footer py-2">
+    <button class="btn btn-sm btn-secondary" type="button" ng-click="closeModalPrecioCondicion()">Cerrar
+    </button>
+    <button class="btn btn-sm btn-primary" type="button" ng-click="guardarPrecioCondicion()">Guardar
+    </button>
+</div>