Allow to set a list of default clients

jresinas · Feb 2, 2017 · b8d71ba · b8d71ba
1 parent 39ed686
commit b8d71ba
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/app/views/settings/_facturaplus_settings.html.erb b/app/views/settings/_facturaplus_settings.html.erb
@@ -121,8 +121,7 @@
 
 			</script>
 		</fieldset>
-	</div>
-	<div class="splitcontentright">
+
 		<fieldset>
 			<legend><%=l(:"facturaplus.label_statuses")%></legend>
 			<p>
@@ -144,6 +143,15 @@
 
 			</script>
 		</fieldset>
+	</div>
+	<div class="splitcontentright">
+		<fieldset>
+			<legend><%=l(:"facturaplus.label_default_content")%></legend>
+			<p>
+				<label><%=l(:"facturaplus.label_default_clients")%></label>
+				<%= text_area_tag 'settings[default_clients]', @settings['default_clients'], :rows => 15 %>
+			</p>
+		</fieldset>
 
 		<fieldset>
 			<legend><%=l(:"facturaplus.label_endpoints")%></legend>

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -16,6 +16,8 @@ en:
     label_sync_client_field: Synchronize
     label_statuses: Statuses
     label_billed_statuses: Billed statuses
+    label_default_content: Default content
+    label_default_clients: Default clients
     label_endpoints: Endpoints
     label_get_clients: Get clientes
     label_set_order: Set order

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -16,6 +16,8 @@ es:
     label_sync_client_field: Sincronización
     label_statuses: Estados
     label_billed_statuses: Estados de facturación
+    label_default_content: Contenido por defecto
+    label_default_clients: Clientes por defecto
     label_endpoints: Endpoints
     label_get_clients: Obtener clientes
     label_set_order: Crear pedido cliente

diff --git a/lib/facturaplus/custom_fields_controller_patch.rb b/lib/facturaplus/custom_fields_controller_patch.rb
@@ -22,8 +22,8 @@ def sync_client_field
 				  	res = Facturaplus::Fp.get_clients(client_field_id)
 
 				  	if res[:result]
-				  		client_field.possible_values=res[:options]
-						render :text => {:type => 'success', :message => l(:'facturaplus.text_sync_success'), :data => res[:options]}.to_json and return if client_field.save
+				  		client_field.possible_values = (Setting.plugin_redmine_facturaplus['default_clients'].split("\r\n") + res[:options])
+						render :text => {:type => 'success', :message => l(:'facturaplus.text_sync_success'), :data => client_field.possible_values}.to_json and return if client_field.save
 					end
 				end
 				render :text => {:type => 'error', :message => l(:'facturaplus.text_sync_fail')}.to_json