diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php
index 63d9b20cc64b..15c431213fea 100644
--- a/app/Helpers/Invoice/InvoiceItemSum.php
+++ b/app/Helpers/Invoice/InvoiceItemSum.php
@@ -63,7 +63,7 @@ class InvoiceItemSum
 	public function process()
 	{
 
-		if(!$this->invoice->line_items || count($this->invoice->line_items) == 0){
+		if(!$this->invoice->line_items || !isset($this->invoice->line_items) || count($this->invoice->line_items) == 0){
 			$this->items = [];
 			return $this;
 		}
diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php
index e169034fe6af..85e3103f7d6f 100644
--- a/app/Helpers/Invoice/InvoiceSum.php
+++ b/app/Helpers/Invoice/InvoiceSum.php
@@ -65,6 +65,7 @@ class InvoiceSum
 
 	public function build()
 	{
+
 		$this->calculateLineItems()
 			 ->calculateDiscount()
 			 ->calculateCustomValues()
@@ -99,17 +100,17 @@ class InvoiceSum
 
 	private function calculateCustomValues()
 	{
-		$this->total_taxes += $this->valuerTax($this->invoice->custom_value1, $this->invoice->custom_surcharge_taxes1);
-        $this->total_custom_values += $this->valuer($this->invoice->custom_value1);
+		$this->total_taxes += $this->valuerTax($this->invoice->custom_surcharge1, $this->invoice->custom_surcharge_taxes1);
+        $this->total_custom_values += $this->valuer($this->invoice->custom_surcharge1);
 
-		$this->total_taxes += $this->valuerTax($this->invoice->custom_value2, $this->invoice->custom_surcharge_taxes2);
-        $this->total_custom_values += $this->valuer($this->invoice->custom_value2);
+		$this->total_taxes += $this->valuerTax($this->invoice->custom_surcharge2, $this->invoice->custom_surcharge_taxes2);
+        $this->total_custom_values += $this->valuer($this->invoice->custom_surcharge2);
 
-		$this->total_taxes += $this->valuerTax($this->invoice->custom_value3, $this->invoice->custom_surcharge_taxes3);
-        $this->total_custom_values += $this->valuer($this->invoice->custom_value3);
+		$this->total_taxes += $this->valuerTax($this->invoice->custom_surcharge3, $this->invoice->custom_surcharge_taxes3);
+        $this->total_custom_values += $this->valuer($this->invoice->custom_surcharge3);
 
-        $this->total_taxes += $this->valuerTax($this->invoice->custom_value4, $this->invoice->custom_surcharge_taxes4);
-        $this->total_custom_values += $this->valuer($this->invoice->custom_value4);
+        $this->total_taxes += $this->valuerTax($this->invoice->custom_surcharge4, $this->invoice->custom_surcharge_taxes4);
+        $this->total_custom_values += $this->valuer($this->invoice->custom_surcharge4);
 
         $this->total += $this->total_custom_values;
 
diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php
index b2980cb552c1..7edeb9c112f3 100644
--- a/app/Helpers/Invoice/InvoiceSumInclusive.php
+++ b/app/Helpers/Invoice/InvoiceSumInclusive.php
@@ -100,17 +100,17 @@ class InvoiceSumInclusive
 
 	private function calculateCustomValues()
 	{
-		$this->total_taxes += $this->valuerTax($this->invoice->custom_value1, $this->invoice->custom_surcharge_taxes1);
-        $this->total_custom_values += $this->valuer($this->invoice->custom_value1);
+		$this->total_taxes += $this->valuerTax($this->invoice->custom_surcharge1, $this->invoice->custom_surcharge_taxes1);
+        $this->total_custom_values += $this->valuer($this->invoice->custom_surcharge1);
 
-		$this->total_taxes += $this->valuerTax($this->invoice->custom_value2, $this->invoice->custom_surcharge_taxes2);
-        $this->total_custom_values += $this->valuer($this->invoice->custom_value2);
+		$this->total_taxes += $this->valuerTax($this->invoice->custom_surcharge2, $this->invoice->custom_surcharge_taxes2);
+        $this->total_custom_values += $this->valuer($this->invoice->custom_surcharge2);
 
-		$this->total_taxes += $this->valuerTax($this->invoice->custom_value3, $this->invoice->custom_surcharge_taxes3);
-        $this->total_custom_values += $this->valuer($this->invoice->custom_value3);
+		$this->total_taxes += $this->valuerTax($this->invoice->custom_surcharge3, $this->invoice->custom_surcharge_taxes3);
+        $this->total_custom_values += $this->valuer($this->invoice->custom_surcharge3);
 
-        $this->total_taxes += $this->valuerTax($this->invoice->custom_value4, $this->invoice->custom_surcharge_taxes4);
-        $this->total_custom_values += $this->valuer($this->invoice->custom_value4);
+        $this->total_taxes += $this->valuerTax($this->invoice->custom_surcharge4, $this->invoice->custom_surcharge_taxes4);
+        $this->total_custom_values += $this->valuer($this->invoice->custom_surcharge4);
 
         $this->total += $this->total_custom_values;
 
diff --git a/app/Http/Controllers/OpenAPI/InvoiceSchema.php b/app/Http/Controllers/OpenAPI/InvoiceSchema.php
index 4466d75f6ea0..3e73972ef2e1 100644
--- a/app/Http/Controllers/OpenAPI/InvoiceSchema.php
+++ b/app/Http/Controllers/OpenAPI/InvoiceSchema.php
@@ -39,6 +39,10 @@
  *       @OA\Property(property="last_viewed", type="number", format="integer", example="1434342123", description="Timestamp"),
  *       @OA\Property(property="updated_at", type="number", format="integer", example="1434342123", description="Timestamp"),
  *       @OA\Property(property="archived_at", type="number", format="integer", example="1434342123", description="Timestamp"),
+ *       @OA\Property(property="custom_surcharge1", type="number", format="float", example="10.00", description="First Custom Surcharge"),
+ *       @OA\Property(property="custom_surcharge2", type="number", format="float", example="10.00", description="Second Custom Surcharge"),
+ *       @OA\Property(property="custom_surcharge3", type="number", format="float", example="10.00", description="Third Custom Surcharge"),
+ *       @OA\Property(property="custom_surcharge4", type="number", format="float", example="10.00", description="Fourth Custom Surcharge"),
  *       @OA\Property(property="custom_surcharge_taxes", type="boolean", example=true, description="Toggles charging taxes on custom surcharge amounts"),
  * )
  */
\ No newline at end of file
diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
index 1e38c982d15f..31af5d0aaeba 100644
--- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
@@ -34,7 +34,6 @@ class StoreInvoiceRequest extends Request
     public function rules()
     {
         $this->sanitize();
-
         return [
             'client_id' => 'required',
            // 'invoice_type_id' => 'integer',
@@ -47,8 +46,8 @@ class StoreInvoiceRequest extends Request
         $input = $this->all();
 
         $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
-        $input['line_items'] = isset($input['line_items']) ?: [];
-
+        $input['line_items'] = isset($input['line_items']) ? $input['line_items'] : [];
+        //$input['line_items'] = json_encode($input['line_items']);
         $this->replace($input);
 
         return $this->all();
diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php
index 68b7a795ac35..4161aad020c3 100644
--- a/app/Repositories/InvoiceRepository.php
+++ b/app/Repositories/InvoiceRepository.php
@@ -57,7 +57,6 @@ class InvoiceRepository extends BaseRepository
         $starting_amount = $invoice->amount;
 
         $invoice->fill($data);
-
         $invoice->save();
 
         if(isset($data['client_contacts']))
diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php
index dc7fb9618296..b87d2216436b 100644
--- a/app/Transformers/InvoiceTransformer.php
+++ b/app/Transformers/InvoiceTransformer.php
@@ -116,12 +116,12 @@ class InvoiceTransformer extends EntityTransformer
             'custom_value4' => (string) $invoice->custom_value4 ?: '',
             'has_tasks' => (bool) $invoice->has_tasks,
             'has_expenses' => (bool) $invoice->has_expenses,
-            'custom_surcharge1' => $invoice->custom_surcharge1 ?: '',
-            'custom_surcharge2' => $invoice->custom_surcharge2 ?: '',
-            'custom_surcharge3' => $invoice->custom_surcharge3 ?: '',
-            'custom_surcharge4' => $invoice->custom_surcharge4 ?: '',
+            'custom_surcharge1' => (float)$invoice->custom_surcharge1,
+            'custom_surcharge2' => (float)$invoice->custom_surcharge2,
+            'custom_surcharge3' => (float)$invoice->custom_surcharge3,
+            'custom_surcharge4' => (float)$invoice->custom_surcharge4,
             'custom_surcharge_taxes' => (bool) $invoice->custom_surcharge_taxes,
-            'line_items' => $invoice->line_items ?: '',
+            'line_items' => $invoice->line_items ?: (array)[],
             'backup' => $invoice->backup ?: '',
             'settings' => $invoice->settings ?: '',