-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add changes for bookings and structure
- add new credit card entity for booking - add mobile phone in structure details - add notes for booking - remove required phone in guest details
- Loading branch information
alberto
committed
May 8, 2013
1 parent
2d9fda1
commit 809cd4b
Showing
16 changed files
with
439 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| package model; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| import javax.xml.bind.annotation.XmlRootElement; | ||
|
|
||
| import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
|
|
||
| public class CreditCard implements Serializable { | ||
| private Integer id; | ||
| private String cardType; | ||
| private String cardNumber; | ||
| private Integer expMonth; | ||
| private Integer expYear; | ||
| private String securityCode; | ||
| private String firstName; | ||
| private String lastName; | ||
| private Integer id_booking; | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| final int prime = 31; | ||
| int result = 1; | ||
| result = prime * result + ((id == null) ? 0 : id.hashCode()); | ||
| return result; | ||
| } | ||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if (this == obj) | ||
| return true; | ||
| if (obj == null) | ||
| return false; | ||
| if (getClass() != obj.getClass()) | ||
| return false; | ||
| CreditCard other = (CreditCard) obj; | ||
| if (id == null) { | ||
| if (other.id != null) | ||
| return false; | ||
| } else if (!id.equals(other.id)) | ||
| return false; | ||
| return true; | ||
| } | ||
| public Integer getId() { | ||
| return id; | ||
| } | ||
| public void setId(Integer id) { | ||
| this.id = id; | ||
| } | ||
| public String getCardType() { | ||
| return cardType; | ||
| } | ||
| public void setCardType(String cardType) { | ||
| this.cardType = cardType; | ||
| } | ||
| public String getCardNumber() { | ||
| return cardNumber; | ||
| } | ||
| public void setCardNumber(String cardNumber) { | ||
| this.cardNumber = cardNumber; | ||
| } | ||
| public Integer getExpMonth() { | ||
| return expMonth; | ||
| } | ||
| public void setExpMonth(Integer expMonth) { | ||
| this.expMonth = expMonth; | ||
| } | ||
| public Integer getExpYear() { | ||
| return expYear; | ||
| } | ||
| public void setExpYear(Integer expYear) { | ||
| this.expYear = expYear; | ||
| } | ||
| public String getSecurityCode() { | ||
| return securityCode; | ||
| } | ||
| public void setSecurityCode(String securityCode) { | ||
| this.securityCode = securityCode; | ||
| } | ||
| public String getFirstName() { | ||
| return firstName; | ||
| } | ||
| public void setFirstName(String firstName) { | ||
| this.firstName = firstName; | ||
| } | ||
| public String getLastName() { | ||
| return lastName; | ||
| } | ||
| public void setLastName(String lastName) { | ||
| this.lastName = lastName; | ||
| } | ||
| public Integer getId_booking() { | ||
| return id_booking; | ||
| } | ||
| public void setId_booking(Integer id_booking) { | ||
| this.id_booking = id_booking; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /******************************************************************************* | ||
| * | ||
| * Copyright 2013 - Sardegna Ricerche, Distretto ICT, Pula, Italy | ||
| * | ||
| * Licensed under the EUPL, Version 1.1. | ||
| * You may not use this work except in compliance with the Licence. | ||
| * You may obtain a copy of the Licence at: | ||
| * | ||
| * http://www.osor.eu/eupl | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the Licence is distributed on an "AS IS" basis, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the Licence for the specific language governing permissions and limitations under the Licence. | ||
| * In case of controversy the competent court is the Court of Cagliari (Italy). | ||
| *******************************************************************************/ | ||
| package persistence.mybatis.mappers; | ||
|
|
||
| import model.CreditCard; | ||
|
|
||
| public interface CreditCardMapper { | ||
| public CreditCard findCreditCardById(Integer id); | ||
| public CreditCard findCreditCardByIdBooking(Integer id_booking); | ||
| public Integer updateCreditCard(CreditCard creditCard); | ||
| public Integer insertCreditCard(CreditCard creditCard); | ||
| public Integer deleteCreditCard(Integer id); | ||
| public Integer deleteCreditCardByIdBooking(Integer id_booking); | ||
| } |
Oops, something went wrong.