-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Mejoras de visualizacion de menus y traducciones #10
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
package com.datamasters.modelo; | ||
|
||
public class Item { | ||
public class Item { | ||
private String code; | ||
private String description; | ||
private double sellingPrice; | ||
|
@@ -76,13 +76,14 @@ public void setPreparationTimeMinutes(int preparationTimeMinutes) { | |
|
||
@Override | ||
public String toString() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rompe Lost Test |
||
return "Item{" + | ||
"code='" + this.code + '\'' + | ||
", description='" + this.description + '\'' + | ||
", sellingPrice=" + this.sellingPrice + | ||
", shippingCost=" + this.shippingCost + | ||
", preparationTimeMinutes=" + this.preparationTimeMinutes + | ||
'}'; | ||
StringBuilder stringBuilder = new StringBuilder(); | ||
stringBuilder.append("Codigo: ").append(this.code).append("\n"); | ||
stringBuilder.append("Descripcion: ").append(this.description).append("\n"); | ||
stringBuilder.append("Precio de venta: ").append(this.sellingPrice).append("\n"); | ||
stringBuilder.append("Costo de envio: ").append(this.shippingCost).append("\n"); | ||
stringBuilder.append("Tiempo de preparacion (minutos): ").append(this.preparationTimeMinutes).append("\n"); | ||
stringBuilder.append("\n----------------------------------------").append("\n"); | ||
return stringBuilder.toString(); | ||
} | ||
} | ||
|
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,8 +16,9 @@ public Orders(int orderNumber, Customer customer, Item item, int quantityUnits, | |
this.item = item; | ||
this.quantityUnits = quantityUnits; | ||
this.orderDateTime = orderDateTime; | ||
this.preparationTimeMinutes = item.getPreparationTimeMinutes()*quantityUnits; | ||
this.preparationTimeMinutes = item.getPreparationTimeMinutes() * quantityUnits; | ||
} | ||
|
||
public int getOrderNumber() { | ||
return orderNumber; | ||
} | ||
|
@@ -87,18 +88,21 @@ public boolean isCancelable(LocalDateTime currentTime) { | |
|
||
@Override | ||
public String toString() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rompe Lost Test |
||
return "Order{" + | ||
"orderNumber=" + orderNumber + | ||
", customer=" + customer.getId() + customer.getName() + | ||
", item=" + item.getCode() +item.getDescription() + | ||
", quantityUnits=" + quantityUnits + | ||
", Item price= " + item.getSellingPrice()+ | ||
", Order price= " + calculateOrderPrice() + | ||
", orderDateTime=" + orderDateTime + | ||
", preparationTimeMinutes=" + this.preparationTimeMinutes + | ||
", orderIsCancelable=" + isCancelable(LocalDateTime.now()) + | ||
", shippingCost= " + item.getShippingCost()+ | ||
", orderIsSent=" + orderIsSent(LocalDateTime.now()) + | ||
'}'; | ||
StringBuilder stringBuilder = new StringBuilder(); | ||
stringBuilder.append("Numero de pedido: ").append(orderNumber).append("\n"); | ||
stringBuilder.append("Cliente: ").append(customer.getId()).append(", ").append(customer.getName()).append("\n"); | ||
stringBuilder.append("Articulo: ").append(item.getCode()).append(", ").append(item.getDescription()) | ||
.append("\n"); | ||
stringBuilder.append("Cantidad de unidades: ").append(quantityUnits).append("\n"); | ||
stringBuilder.append("Precio del articulo: ").append(item.getSellingPrice()).append("\n"); | ||
stringBuilder.append("Precio del pedido: ").append(calculateOrderPrice()).append("\n"); | ||
stringBuilder.append("Fecha y hora del pedido: ").append(orderDateTime).append("\n"); | ||
stringBuilder.append("Tiempo de preparacion (minutos): ").append(preparationTimeMinutes).append("\n"); | ||
stringBuilder.append("Es posible cancelar el pedido: ").append(isCancelable(LocalDateTime.now())).append("\n"); | ||
stringBuilder.append("Costo de envio: ").append(item.getShippingCost()).append("\n"); | ||
stringBuilder.append("El pedido ha sido enviado: ").append(orderIsSent(LocalDateTime.now())).append("\n"); | ||
stringBuilder.append("\n----------------------------------------").append("\n"); | ||
return stringBuilder.toString(); | ||
} | ||
|
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
package com.datamasters.modelo; | ||
|
||
public class PremiumCustomer extends Customer { | ||
public PremiumCustomer(String name, String address, String id, String email, double membershipFee, double shippingDiscount) { | ||
public PremiumCustomer(String name, String address, String id, String email, double membershipFee, | ||
double shippingDiscount) { | ||
super(name, address, id, email, CustomerType.PREMIUM, membershipFee, shippingDiscount); | ||
} | ||
|
||
|
@@ -22,14 +23,16 @@ public double shippingDiscount() { | |
|
||
@Override | ||
public String toString() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rompe Lost Test |
||
return "PremiumCustomer{" + | ||
"name='" + getName() + '\'' + | ||
", address='" + getAddress() + '\'' + | ||
", id='" + getId() + '\'' + | ||
", email='" + getEmail() + '\'' + | ||
", customerType=" + getCustomerType() + | ||
", membershipFee=" + getMembershipFee() + | ||
", shippingDiscount=" + getShippingDiscount() + | ||
'}'; | ||
StringBuilder stringBuilder = new StringBuilder(); | ||
stringBuilder.append("Nombre: ").append(getName()).append("\n"); | ||
stringBuilder.append("Dirección: ").append(getAddress()).append("\n"); | ||
stringBuilder.append("ID: ").append(getId()).append("\n"); | ||
stringBuilder.append("Correo electrónico: ").append(getEmail()).append("\n"); | ||
stringBuilder.append("Tipo de cliente: ").append(getCustomerType()).append("\n"); | ||
stringBuilder.append("Tarifa de membresía: ").append(String.format("%.2f", getMembershipFee())).append("\n"); | ||
stringBuilder.append("Descuento de envío: ").append(String.format("%.2f", getShippingDiscount())).append("\n"); | ||
stringBuilder.append("\n----------------------------------------").append("\n"); | ||
return stringBuilder.toString(); | ||
} | ||
|
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,12 +22,14 @@ public double shippingDiscount() { | |
|
||
@Override | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rompe Lost Test |
||
public String toString() { | ||
return "StandardCustomer{" + | ||
"name='" + getName() + '\'' + | ||
", address='" + getAddress() + '\'' + | ||
", id='" + getId() + '\'' + | ||
", email='" + getEmail() + '\'' + | ||
", customerType=" + getCustomerType() + | ||
'}'; | ||
StringBuilder stringBuilder = new StringBuilder(); | ||
stringBuilder.append("Nombre: ").append(getName()).append("\n"); | ||
stringBuilder.append("Dirección: ").append(getAddress()).append("\n"); | ||
stringBuilder.append("ID: ").append(getId()).append("\n"); | ||
stringBuilder.append("Correo electrónico: ").append(getEmail()).append("\n"); | ||
stringBuilder.append("Tipo de cliente: ").append(getCustomerType()).append("\n"); | ||
stringBuilder.append("\n----------------------------------------").append("\n"); | ||
return stringBuilder.toString(); | ||
} | ||
|
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rompe Lost Test