From caabe3f2d6241ea3a9643db22cb8deeabca527e6 Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Thu, 21 Jan 2021 08:48:21 +0200
Subject: [PATCH 01/14] Complete first two exercises

---
 exercises/B-hello-world/exercise.js | 5 ++++-
 exercises/C-variables/exercise.js   | 4 +++-
 exercises/D-strings/README.md       | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
index b179ee953..415d78f10 100644
--- a/exercises/B-hello-world/exercise.js
+++ b/exercises/B-hello-world/exercise.js
@@ -1 +1,4 @@
-console.log("Hello world");
+console.log("Hello world" + " I am enjoying the journey into JavaScript and taking the challenge on head-first!");
+console.log("This is a interesting exercise.")
+// console.log(What happens now?)
+console.log(21)
\ No newline at end of file
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..a1af96912 100644
--- a/exercises/C-variables/exercise.js
+++ b/exercises/C-variables/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `greeting`
-
+var greeting = "Hello World!";
+console.log(greeting);
+console.log(greeting);
 console.log(greeting);
diff --git a/exercises/D-strings/README.md b/exercises/D-strings/README.md
index 1516f536e..63c85a9d6 100644
--- a/exercises/D-strings/README.md
+++ b/exercises/D-strings/README.md
@@ -1,6 +1,6 @@
 In programming there are different _types of_ data. You've used one data type already: **string**.
 
-Computers recognise strings as a sequence of characters but to humans, strings are simply lines of text.
+Computers recognize strings as a sequence of characters but to humans, strings are simply lines of text.
 
 ```js
 var message = "This is a string";

From 0f893efbef7b7d0e7b7e34651445f6cfb90e1b8b Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Thu, 21 Jan 2021 12:08:59 +0200
Subject: [PATCH 02/14] completed exercises d, e and f1.

---
 exercises/D-strings/exercise.js               | 4 +++-
 exercises/E-strings-concatenation/exercise.js | 3 +++
 exercises/F-strings-methods/exercise.js       | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
index 2cffa6a81..41c1449e7 100644
--- a/exercises/D-strings/exercise.js
+++ b/exercises/D-strings/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
+var message = "Strings are brilliant tools in jS.";
+var messageType = typeof message;
 console.log(message);
+console.log(messageType);
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
index 2cffa6a81..9684d8bcf 100644
--- a/exercises/E-strings-concatenation/exercise.js
+++ b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `message`
+var greeting = "Hi there, welcome, my name is";
+var name = " Ryan";
 
+var message = greeting + name;
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
index 2cffa6a81..26e10b48e 100644
--- a/exercises/F-strings-methods/exercise.js
+++ b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,4 @@
 // Start by creating a variable `message`
-
+name = "Ryan";
+message = "Hey there my name is " + name + " and it is " + name.length + " characters long.";
 console.log(message);

From c23c3a9079e5e5e01cd5613691d8c42978030809 Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Thu, 21 Jan 2021 15:25:05 +0200
Subject: [PATCH 03/14] completed exercise F

---
 exercises/F-strings-methods/exercise2.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
index b4b46943d..542c828a4 100644
--- a/exercises/F-strings-methods/exercise2.js
+++ b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,5 @@
 const name = " Daniel  ";
+greeting = "Hi, my name is " + name.trim() + " and it is " + name.length + " characters long.";
+// message = greeting.trim();
 
-console.log(message);
+console.log(greeting);

From 0e2046e13e3aebc8d9874ff480b8ca6d7eab7858 Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Thu, 21 Jan 2021 16:01:01 +0200
Subject: [PATCH 04/14] complete exercises I and J

---
 exercises/G-numbers/README.md      | 4 ++--
 exercises/G-numbers/exercise.js    | 7 +++++++
 exercises/I-floats/exercise.js     | 8 ++++++++
 exercises/J-functions/exercise.js  | 5 +++++
 exercises/J-functions/exercise2.js | 1 +
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/exercises/G-numbers/README.md b/exercises/G-numbers/README.md
index 4c6f45a41..1e8b18a82 100644
--- a/exercises/G-numbers/README.md
+++ b/exercises/G-numbers/README.md
@@ -6,7 +6,7 @@ Unlike strings, numbers do not need to be wrapped in quotes.
 var age = 30;
 ```
 
-You can use mathematical operators to caclulate numbers:
+You can use mathematical operators to calculate numbers:
 
 ```js
 var sum = 10 + 2; // 12
@@ -25,5 +25,5 @@ var difference = 10 - 2; // 8
 ```
 Number of students: 15
 Number of mentors: 8
-Total numnber of students and mentors: 23
+Total number of students and mentors: 23
 ```
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
index 49e7bc00b..78ce7d5b6 100644
--- a/exercises/G-numbers/exercise.js
+++ b/exercises/G-numbers/exercise.js
@@ -1 +1,8 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var numberOfStudents = 22;
+var numberOfMentors = 15;
+
+sum = numberOfStudents + numberOfMentors;
+
+console.log(sum);
+// console.log(numberOfStudents + numberOfMentors);
\ No newline at end of file
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..b00fcbc64 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,10 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+
+var sum = numberOfMentors + numberOfStudents;
+
+var percentageOfStudents = Math.round(numberOfStudents / sum * 100);
+var percentageOfMentors = Math.round(numberOfMentors / sum * 100);
+
+console.log(percentageOfStudents+"%");
+console.log(percentageOfMentors+"%");
\ No newline at end of file
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..bd5c57928 100644
--- a/exercises/J-functions/exercise.js
+++ b/exercises/J-functions/exercise.js
@@ -1,7 +1,12 @@
 function halve(number) {
   // complete the function here
+  return number / 2;
 }
 
 var result = halve(12);
+var result2 = halve(23);
+var result3 = halve(30);
 
 console.log(result);
+console.log(result2);
+console.log(result3);
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
index 82ef5e780..468d45596 100644
--- a/exercises/J-functions/exercise2.js
+++ b/exercises/J-functions/exercise2.js
@@ -1,5 +1,6 @@
 function triple(number) {
   // complete function here
+  return number * 3;
 }
 
 var result = triple(12);

From 8c5ddfb6ae37cec76e293e00d4955ad54f8532ce Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Thu, 21 Jan 2021 20:37:47 +0200
Subject: [PATCH 05/14] complete exercise K

---
 exercises/K-functions-parameters/exercise5.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
index 7c5bcd605..9e6e639c8 100644
--- a/exercises/K-functions-parameters/exercise5.js
+++ b/exercises/K-functions-parameters/exercise5.js
@@ -1,5 +1,7 @@
 // Declare your function here
-
+function createLongGreeting(name, age){
+    return "Hello, my name is " + name + " and I'm " + age + " years old.";
+}
 const greeting = createLongGreeting("Daniel", 30);
 
 console.log(greeting);

From 23c636673460279c079d47203be4a981b75bf288 Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Thu, 21 Jan 2021 20:39:13 +0200
Subject: [PATCH 06/14] completed exercises in K

---
 exercises/K-functions-parameters/exercise.js  | 3 ++-
 exercises/K-functions-parameters/exercise2.js | 4 +++-
 exercises/K-functions-parameters/exercise3.js | 4 +++-
 exercises/K-functions-parameters/exercise4.js | 5 ++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
index 8d5db5e69..a4eed9d76 100644
--- a/exercises/K-functions-parameters/exercise.js
+++ b/exercises/K-functions-parameters/exercise.js
@@ -1,6 +1,7 @@
 // Complete the function so that it takes input parameters
-function multiply() {
+function multiply(num1, num2) {
   // Calculate the result of the function and return it
+  return num1 * num2;
 }
 
 // Assign the result of calling the function the variable `result`
diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js
index db7a8904b..ff8703696 100644
--- a/exercises/K-functions-parameters/exercise2.js
+++ b/exercises/K-functions-parameters/exercise2.js
@@ -1,5 +1,7 @@
 // Declare your function first
-
+function divide (num1, num2){
+    return num1/num2;
+}
 var result = divide(3, 4);
 
 console.log(result);
diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js
index 537e9f4ec..60bc7aefe 100644
--- a/exercises/K-functions-parameters/exercise3.js
+++ b/exercises/K-functions-parameters/exercise3.js
@@ -1,5 +1,7 @@
 // Write your function here
-
+function createGreeting(name){
+    return "Hi there, my name is " + name;
+}
 var greeting = createGreeting("Daniel");
 
 console.log(greeting);
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
index 7ab44589e..be037ea9f 100644
--- a/exercises/K-functions-parameters/exercise4.js
+++ b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,8 @@
 // Declare your function first
-
+function addition(num1, num2){
+    return num1 + num2;
+}
 // Call the function and assign to a variable `sum`
+var sum = addition(13, 124);
 
 console.log(sum);

From 9487c5f7db47f9cd28e40c32c847c651b890fa02 Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Thu, 21 Jan 2021 21:41:29 +0200
Subject: [PATCH 07/14] creat initial function

---
 exercises/L-functions-nested/README.md   |  2 +-
 exercises/L-functions-nested/exercise.js | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/exercises/L-functions-nested/README.md b/exercises/L-functions-nested/README.md
index f5e571303..11597c986 100644
--- a/exercises/L-functions-nested/README.md
+++ b/exercises/L-functions-nested/README.md
@@ -9,7 +9,7 @@ function getAgeInDays(age) {
   return age * 365;
 }
 
-function createCreeting(name, age) {
+function createGreeting(name, age) {
   var ageInDays = getAgeInDays(age);
   var message =
     "My Name is " + name + " and I was born over " + ageInDays + " days ago!";
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index a5d377442..a9b37ff35 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -1,3 +1,18 @@
+// exercise 1
+var students = 8;
+var mentors = 15;
+
+function sum(num1, num2){
+    return num1 + num2;
+}
+
+var percentageOfStudents = Math.round(students/sum(8, 15) * 100);
+var percentageOfMentors = Math.round(mentors/sum(8, 15) * 100);
+console.log(percentageOfStudents + "%");
+console.log(percentageOfMentors + "%");
+
+// exercise2
+
 var mentor1 = "Daniel";
 var mentor2 = "Irina";
 var mentor3 = "Mimi";

From ff32f9c7a8e86dd70b73230186d75bf0f74779fd Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Fri, 22 Jan 2021 19:24:42 +0200
Subject: [PATCH 08/14] added exercise functions

---
 exercises/L-functions-nested/exercise.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index a9b37ff35..ba5821e4a 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -1,15 +1,19 @@
 // exercise 1
 var students = 8;
 var mentors = 15;
+function percentage(total){
+
+var sum = students + mentors;
+return Math.round(total/sum *100);
 
-function sum(num1, num2){
-    return num1 + num2;
 }
 
-var percentageOfStudents = Math.round(students/sum(8, 15) * 100);
-var percentageOfMentors = Math.round(mentors/sum(8, 15) * 100);
-console.log(percentageOfStudents + "%");
-console.log(percentageOfMentors + "%");
+function result(message){
+console.log(message + percentage(8) + "%");
+console.log( message + percentage(15) + "%");
+}
+ result("The percentage of students in the class is ");
+ result("The percentage of mentors in the class is ");
 
 // exercise2
 

From c24056d3c3f61ebdb6ca35bd2c98c0b4a6f50cf1 Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Fri, 22 Jan 2021 20:07:54 +0200
Subject: [PATCH 09/14] completed L exercise 1

---
 exercises/L-functions-nested/exercise.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index ba5821e4a..9a4c6615c 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -1,19 +1,21 @@
 // exercise 1
 var students = 8;
 var mentors = 15;
+
 function percentage(total){
 
 var sum = students + mentors;
-return Math.round(total/sum *100);
+return Math.round(total/sum *100) + "%";
 
 }
 
-function result(message){
-console.log(message + percentage(8) + "%");
-console.log( message + percentage(15) + "%");
+function result(message, type){
+return message + type;
+
 }
- result("The percentage of students in the class is ");
- result("The percentage of mentors in the class is ");
+
+console.log(result("The percentage of ", "students in the class is ") + percentage(8));
+console.log(result("The percentage of ", "mentors in the class is ") + percentage(15));
 
 // exercise2
 

From 84615897d95afe4e663714909010a52881a5476a Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Fri, 22 Jan 2021 20:36:55 +0200
Subject: [PATCH 10/14] complete exercise 2 in L

---
 exercises/L-functions-nested/exercise.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index 9a4c6615c..228e59f26 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -24,3 +24,17 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function upperCase(name){
+    return name.toUpperCase();
+}
+
+function greeting(name){
+    return "HELLO " + name + "!";
+}
+
+console.log(greeting(upperCase(mentor1)));
+console.log(greeting(upperCase(mentor2)));
+console.log(greeting(upperCase(mentor3)));
+console.log(greeting(upperCase(mentor4)));
+console.log(greeting(upperCase(mentor5)));

From 67192e61911650079516f58b86b4c4fbcf0e0c09 Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Fri, 22 Jan 2021 21:50:32 +0200
Subject: [PATCH 11/14] complete mandatory exercises 1- 3

---
 mandatory/1-syntax-errors.js   | 12 ++++++------
 mandatory/2-logic-error.js     |  8 ++++----
 mandatory/3-function-output.js |  3 +++
 mandatory/4-tax.js             | 17 ++++++++++++-----
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index 0a21afd1b..52e58d427 100644
--- a/mandatory/1-syntax-errors.js
+++ b/mandatory/1-syntax-errors.js
@@ -1,16 +1,16 @@
 // There are syntax errors in this code - can you fix it to pass the tests?
 
-function addNumbers(a b c) {
+function addNumbers(a, b, c) {
     return a + b + c;
 }
 
-function introduceMe(name, age)
-return "Hello, my name is " + name "and I am " age + "years old";
-
+function introduceMe(name, age){
+return "Hello, my name is " + name + " and I am " + age + " years old";
+}
 function getTotal(a, b) {
-    total = a ++ b;
+    total = a + b;
 
-    return "The total is total"
+    return "The total is " + total;
 }
 
 /* 
diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js
index 3c578ad87..3f63dfc07 100644
--- a/mandatory/2-logic-error.js
+++ b/mandatory/2-logic-error.js
@@ -1,16 +1,16 @@
 // The syntax for this function is valid but it has an error, find it and fix it.
 
 function trimWord(word) {
-  return wordtrim();
+  return word.trim();
 }
 
 function getWordLength(word) {
-  return "word".length();
+  return word.length;
 }
 
 function multiply(a, b, c) {
-  a * b * c;
-  return;
+return  a * b * c;
+
 }
 
 /* 
diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
index c9221a200..5ae78450d 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -1,15 +1,18 @@
 // Add comments to explain what this function does. You're meant to use Google!
+// The below function will generate a random number between 0 and 1 and multiply by 10 returning a number between 0 and 9
 function getNumber() {
   return Math.random() * 10;
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
+// The below string method concatenates the two arguments. 
 function s(w1, w2) {
   return w1.concat(w2);
 }
 
 function concatenate(firstWord, secondWord, thirdWord) {
   // Write the body of this function to concatenate three words together.
+  return firstWord + " " + secondWord + " " + thirdWord;
   // Look at the test case below to understand what this function is expected to return.
 }
 
diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index c9e41c691..9fb12564d 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -5,7 +5,11 @@
   Sales tax is 20% of the price of the product
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(price) {
+
+return (price + price*0.2);
+
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +21,10 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(calc) {
+  calc = calculateSalesTax();
+  return "£" + calc;
+}
 
 /* 
 ===================================================
@@ -51,16 +58,16 @@ test("calculateSalesTax function - case 3 works", calculateSalesTax(34), 40.8);
 
 test(
   "addTaxAndFormatCurrency function - case 1 works",
-  addTaxAndFormatCurrency(15),
+  addTaxAndFormatCurrency(),
   "£18.00"
 );
 test(
   "addTaxAndFormatCurrency function - case 2 works",
-  addTaxAndFormatCurrency(17.5),
+  addTaxAndFormatCurrency(),
   "£21.00"
 );
 test(
   "addTaxAndFormatCurrency function - case 3 works",
-  addTaxAndFormatCurrency(34),
+  addTaxAndFormatCurrency(),
   "£40.80"
 );

From da4883f72e98296e1d7720a23edeae3fec0258b5 Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Fri, 22 Jan 2021 22:12:30 +0200
Subject: [PATCH 12/14] Update 4-tax.js

---
 mandatory/4-tax.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index 9fb12564d..7a9fac4d6 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -21,9 +21,9 @@ return (price + price*0.2);
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency(calc) {
-  calc = calculateSalesTax();
-  return "£" + calc;
+function addTaxAndFormatCurrency(result) {
+  result = calculateSalesTax();
+  return "£" + result;
 }
 
 /* 

From 23050cda02e8f048ef00dd927097406b2ad30a6d Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Fri, 22 Jan 2021 23:41:30 +0200
Subject: [PATCH 13/14] ateempting final task

---
 mandatory/4-tax.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index 7a9fac4d6..0dbf89956 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -7,7 +7,7 @@
 
 function calculateSalesTax(price) {
 
-return (price + price*0.2);
+return price + price*0.2;
 
 }
 
@@ -21,9 +21,10 @@ return (price + price*0.2);
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency(result) {
-  result = calculateSalesTax();
-  return "£" + result;
+function addTaxAndFormatCurrency(price) {
+
+  return "£" + (calculateSalesTax(price)).toFixed(2);
+
 }
 
 /* 

From 79e10334ce217f628067a7a92db59ce39aeca4bf Mon Sep 17 00:00:00 2001
From: RyanS-Cpt <74462713+RyanS-Cpt@users.noreply.github.com>
Date: Fri, 19 Feb 2021 20:01:44 +0200
Subject: [PATCH 14/14] completed 4-tax.js

---
 mandatory/4-tax.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index 0dbf89956..cb2d30b7a 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -22,8 +22,10 @@ return price + price*0.2;
 */
 
 function addTaxAndFormatCurrency(price) {
+  let result =  (calculateSalesTax(price)).toFixed(2);
+    console.log(result);
+    return "£" + result;
 
-  return "£" + (calculateSalesTax(price)).toFixed(2);
 
 }
 
@@ -59,16 +61,16 @@ test("calculateSalesTax function - case 3 works", calculateSalesTax(34), 40.8);
 
 test(
   "addTaxAndFormatCurrency function - case 1 works",
-  addTaxAndFormatCurrency(),
+  addTaxAndFormatCurrency(15),
   "£18.00"
 );
 test(
   "addTaxAndFormatCurrency function - case 2 works",
-  addTaxAndFormatCurrency(),
+  addTaxAndFormatCurrency(17.5),
   "£21.00"
 );
 test(
   "addTaxAndFormatCurrency function - case 3 works",
-  addTaxAndFormatCurrency(),
+  addTaxAndFormatCurrency(34),
   "£40.80"
 );