Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main

# Conflicts:
#	src/main/java/command/Process.java

Author: leowyh

data/duke.txt

@@ -75,4 +75,8 @@ public boolean isDeletePayee(String input) {
     public boolean isgetpayee(String input)  {
         return input.startsWith("getpayee");
     }
+
+    public boolean isInvoice(String input) {
+        return input.startsWith("invoice");
+    }
 }

src/main/java/command/Instruction.java

@@ -88,6 +88,8 @@ public static boolean parse(String input, TaskList tasklist, Ui ui,
                 process.addPayee(input, managermap, ui);
             } else if (instr.isDeletePayee(input)) {
                 process.deletePayee(input, managermap, ui);
+            } else if (instr.isInvoice(input)) {
+                process.inVoice(input, tasklist, ui);
             } else {
                 throw new AlphaNUSException("     ☹ OOPS!!! I'm sorry, but I don't know what that means :-(");
             }

src/main/java/command/Parser.java

@@ -16,42 +16,22 @@ public class Deadline extends Task implements Serializable {
     /**
      * Creates a Deadline instance and initialises the required attributes.
      * @param description Description of the deadline.
-     * @param by Deadline of the task in format "dd/MM/yyyy HHmm".
      */
-    public Deadline(String description, String by) {
+    public Deadline(String description) {
         super(description);
         this.by = null;
         this.type = "D";
-        this.inVoice = false;
+        this.inVoice = null;
+        this.isInVoice = false;
     }
 
     /**
      * set the value of inVoice as true.
      */
-    public void setInVoice() {
-        this.inVoice = true;
-        setBy(inVoice);
-    }
-
-    /*
-    public void setBy(boolean inVoice){
-        if(inVoice==true){
-            Date date = new Date(System.currentTimeMillis());
-            java.util.Calendar calendar = java.util.Calendar.getInstance();
-            calendar.setTime(date);
-            calendar.add(Calendar.DAY_OF_MONTH,30);
-            Date newDate = calendar.getTime();
-            this.by = dataformat.format(newDate);
-        }
-    }
-    */
-
-    /**
-     * return the boolean value (true or false) of the invoice.
-     * @return the task's invoice value.
-     */
-    public boolean getInVoice() {
-        return inVoice;
+    public void setInVoice(String inVoice) {
+        this.isInVoice = true;
+        setBy(isInVoice);
+        this.inVoice = inVoice;
     }
 
     /**
@@ -60,6 +40,6 @@ public boolean getInVoice() {
      */
     @Override
     public String giveTask() {
-        return "[D]" + super.giveTask() + "(by: " + by + ")";
+        return "[D]" + super.giveTask() + "(by: " + by + ")" + " (invoice: " + inVoice + ")";
     }
 }

src/main/java/command/Process.java

@@ -16,7 +16,8 @@ public class Task implements Serializable {
     protected String at;
     protected String after;
     protected String period;
-    protected Boolean inVoice;
+    protected Boolean isInVoice;
+    protected String inVoice;
 
     private static SimpleDateFormat dataformat = new SimpleDateFormat("dd/MM/yyyy HHmm");
 
@@ -42,7 +43,7 @@ public String giveTask() {
      * @return The status icon of the Task based on isDone.
      */
     public String getStatusIcon() {
-        return (isDone ? "✓" : "✘"); //return tick or X symbols
+        return (isInVoice ? "✓" : "✘"); //return tick or X symbols
     }
 
     /**
@@ -52,6 +53,15 @@ public void setDone() {
         this.isDone = true;
     }
 
+    /**
+     * set the value of inVoice as true.
+     */
+    public void setInVoice(String inVoice) {
+        this.isInVoice = true;
+        setBy(isInVoice);
+        this.inVoice = inVoice;
+    }
+
     /**
      * Sets a new value to the by attribute.
      */
@@ -115,9 +125,25 @@ public String getAt() {
 
     /**
      * Gets the invoice status of the Task.
-     * @return a boolean value invoice.
+     * @return a boolean value isInvoice.
+     */
+    public Boolean statusInVoice() {
+        return this.isInVoice;
+    }
+
+    /**
+     * return the boolean value (true or false) of the invoice.
+     * @return the task's invoice value.
+     */
+    public boolean getIsInVoice() {
+        return this.isInVoice;
+    }
+
+    /**
+     * Gets the invoice string of the Task.
+     * @return a string represents invoice.
      */
-    public boolean getInVoice() {
+    public String getInVoice() {
         return this.inVoice;
     }
 }

src/main/java/task/Deadline.java

@@ -207,6 +207,16 @@ public void printAddPayeeMessage(String name, Payee payee, int payeesize) {
         System.out.print(line);
     }
 
+    /**
+     * Prints message to indicate a deadline with an invoice added.
+     * @param task Task to be edited.
+     */
+    public void printAddInvoiceMessage(Task task) {
+        System.out.print(line);
+        System.out.println("\t" + "Got it. I've added invoice to this deadline:");
+        System.out.print("\t" + task.giveTask() + "\n");
+    }
+
     /**
      * Prints message to indicate a Payment being deleted.
      * @param payee Payee containing identification information of Payee.