Ensure line item gateway fees are not cloned

app/Http/Requests/Credit/StoreCreditRequest.php

@@ -107,6 +107,7 @@ class StoreCreditRequest extends Request
         $input = $this->decodePrimaryKeys($input);
 
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
+        $input['line_items'] = $this->cleanFeeItems($input['line_items']);
         $input['amount'] = $this->entityTotalAmount($input['line_items']);
 
         if (array_key_exists('exchange_rate', $input) && is_null($input['exchange_rate'])) {

app/Http/Requests/Invoice/StoreInvoiceRequest.php

@@ -108,6 +108,7 @@ class StoreInvoiceRequest extends Request
 
         if (isset($input['line_items']) && is_array($input['line_items'])) {
             $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
+            $input['line_items'] = $this->cleanFeeItems($input['line_items']);
             $input['amount'] = $this->entityTotalAmount($input['line_items']);
         }
         if(isset($input['partial']) && $input['partial'] == 0) {

app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php

@@ -95,6 +95,7 @@ class StorePurchaseOrderRequest extends Request
 
         if (isset($input['line_items']) && is_array($input['line_items'])) {
             $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
+            $input['line_items'] = $this->cleanFeeItems($input['line_items']);
             $input['amount'] = $this->entityTotalAmount($input['line_items']);
 
         }

app/Http/Requests/Quote/StoreQuoteRequest.php

@@ -101,6 +101,7 @@ class StoreQuoteRequest extends Request
 
         if (isset($input['line_items']) && is_array($input['line_items'])) {
             $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
+            $input['line_items'] = $this->cleanFeeItems($input['line_items']);
             $input['amount'] = $this->entityTotalAmount($input['line_items']);
         }
         if(isset($input['partial']) && $input['partial'] == 0) {

app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php

@@ -148,6 +148,8 @@ class StoreRecurringInvoiceRequest extends Request
         }
 
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
+        $input['line_items'] = $this->cleanFeeItems($input['line_items']);
+
         $input['amount'] = $this->entityTotalAmount($input['line_items']);
 
         if (isset($input['auto_bill'])) {

app/Services/Invoice/AutoBillInvoice.php

@@ -148,6 +148,7 @@ class AutoBillInvoice extends AbstractService
         ]);
 
         nlog("Payment hash created => {$payment_hash->id}");
+        $this->invoice->saveQuietly();
 
         $payment = false;
         try {
@@ -162,6 +163,7 @@ class AutoBillInvoice extends AbstractService
 
         }
 
+        $this->invoice = $this->invoice->fresh();
         $this->invoice->auto_bill_tries += 1;
 
         if ($this->invoice->auto_bill_tries == 3) {

app/Utils/Traits/CleanLineItems.php

@@ -34,6 +34,20 @@ trait CleanLineItems
         return $cleaned_items;
     }
 
+    public function cleanFeeItems($items): array
+    {
+
+        //ensure we never allow gateway fees to be cloned across to new entities
+        foreach ($items as $key => $value) {
+            if (in_array($value->type_id, ['3','4'])) {
+                unset($items[$key]);
+            }
+        }
+
+        return $items;
+
+    }
+
     /**
      * Sets default values for the line_items.
      * @param $item

tests/Feature/TaskStatusApiTest.php

@@ -73,8 +73,6 @@ class TaskStatusApiTest extends TestCase
         ])->put('/api/v1/task_statuses/'.$task_status->hashed_id, $data);
 
 
-        $xx = TaskStatus::where('company_id', $this->company->id)->pluck('status_order');
-
         $t = TaskStatus::where('company_id', $this->company->id)->orderBy('status_order', 'asc')->first();
 
         $this->assertEquals($id, $t->id);