Přidáno nastavení adres a bankovního spojení do globálního nastavení.

closes #101

src/main/java/info/bukova/isspst/data/SettingsData.java

@@ -1,5 +1,8 @@
 package info.bukova.isspst.data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import info.bukova.isspst.mail.MailMessage;
 
 public class SettingsData {
@@ -8,11 +11,18 @@ public class SettingsData {
 	private MailMessage newReqTemplate;
 	private MailMessage authReqTemplate;
 	private MailMessage confReqTemplate;
+	private Address mainAddress;
+	private List<Address> shippingAddrs;
+	private String bankName;
+	private String accountNumber;
+	private String bankCode;
 	
 	public SettingsData() {
 		newReqTemplate = new MailMessage();
 		authReqTemplate = new MailMessage();
 		confReqTemplate = new MailMessage();
+		mainAddress = new Address();
+		shippingAddrs = new ArrayList<Address>();
 	}
 
 	public boolean isEnableRequirements() {
@@ -46,5 +56,45 @@ public class SettingsData {
 	public void setConfReqTemplate(MailMessage confReqTemplate) {
 		this.confReqTemplate = confReqTemplate;
 	}
+	
+	public Address getMainAddress() {
+		return mainAddress;
+	}
+
+	public void setMainAddress(Address mainAddress) {
+		this.mainAddress = mainAddress;
+	}
+
+	public List<Address> getShippingAddrs() {
+		return shippingAddrs;
+	}
+
+	public void setShippingAddrs(List<Address> shippingAddrs) {
+		this.shippingAddrs = shippingAddrs;
+	}
+
+	public String getBankName() {
+		return bankName;
+	}
+
+	public void setBankName(String bankName) {
+		this.bankName = bankName;
+	}
+
+	public String getAccountNumber() {
+		return accountNumber;
+	}
+
+	public void setAccountNumber(String accountNumber) {
+		this.accountNumber = accountNumber;
+	}
+
+	public String getBankCode() {
+		return bankCode;
+	}
+
+	public void setBankCode(String bankCode) {
+		this.bankCode = bankCode;
+	}
 
 }

src/main/java/info/bukova/isspst/services/settings/GlobalSettingServiceImpl.java

@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 
+import info.bukova.isspst.data.Address;
 import info.bukova.isspst.data.GlobalSettings;
 import info.bukova.isspst.data.SettingsData;
 import info.bukova.isspst.services.AbstractOwnedService;
@@ -100,6 +101,13 @@ public class GlobalSettingServiceImpl extends AbstractOwnedService<GlobalSetting
 		}
 		
 		GlobalSettings gs = this.getAll().get(0);
+		
+		for (Address a : settings.getShippingAddrs()) {
+			a.setCompany(settings.getMainAddress().getCompany());
+			a.setIc(settings.getMainAddress().getIc());
+			a.setDic(settings.getMainAddress().getDic());
+		}
+		
 		gs.setData(marshalData(settings));
 		
 		super.update(gs);

src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java

@@ -9,6 +9,7 @@ import org.zkoss.bind.annotation.NotifyChange;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
 import org.zkoss.zul.Window;
 
+import info.bukova.isspst.data.Address;
 import info.bukova.isspst.data.Requirement;
 import info.bukova.isspst.data.SettingsData;
 import info.bukova.isspst.mail.MailMessage;
@@ -22,6 +23,7 @@ public class GlobalSettingsVM {
 	private GlobalSettingsService settingsService;
 	private SettingsData settings;
 	private LocaleConverter locConverter;
+	private Address selAddress;
 	
 	@Init
 	public void init() {
@@ -56,5 +58,25 @@ public class GlobalSettingsVM {
 	public void insertField(@BindingParam("field") String field, @BindingParam("message") MailMessage message) {
 		message.setText(message.getText() + "[" + field + "]");
 	}
+	
+	@Command
+	@NotifyChange("settings")
+	public void addAddress() {
+		settings.getShippingAddrs().add(new Address());
+	}
+	
+	@Command
+	@NotifyChange("settings")
+	public void removeAddress(@BindingParam("addr") Address addr) {
+		settings.getShippingAddrs().remove(addr);
+	}
+
+	public Address getSelAddress() {
+		return selAddress;
+	}
+
+	public void setSelAddress(Address selAddress) {
+		this.selAddress = selAddress;
+	}
 
 }