Fixed issue with searching on related encrypted fields

Author: andrewdrake

src/Http/Controllers/DealController.php

@@ -315,9 +315,8 @@ public function search(Request $request)
                             try {
                                 $relatedField = decrypt($record->{$field[1]});
                             } catch (DecryptException $e) {
+                                $relatedField = $record->{$field[1]};
                             }
-
-                            $relatedField = $record->{$field[1]};
                         } else {
                             $relatedField = $record->{$field[1]};
                         }

src/Http/Controllers/DeliveryController.php

@@ -246,9 +246,8 @@ public function search(Request $request)
                             try {
                                 $relatedField = decrypt($record->{$field[1]});
                             } catch (DecryptException $e) {
+                                $relatedField = $record->{$field[1]};
                             }
-
-                            $relatedField = $record->{$field[1]};
                         } else {
                             $relatedField = $record->{$field[1]};
                         }

src/Http/Controllers/InvoiceController.php

@@ -260,9 +260,8 @@ public function search(Request $request)
                             try {
                                 $relatedField = decrypt($record->{$field[1]});
                             } catch (DecryptException $e) {
+                                $relatedField = $record->{$field[1]};
                             }
-
-                            $relatedField = $record->{$field[1]};
                         } else {
                             $relatedField = $record->{$field[1]};
                         }

src/Http/Controllers/PurchaseOrderController.php

@@ -326,9 +326,8 @@ public function search(Request $request)
                             try {
                                 $relatedField = decrypt($record->{$field[1]});
                             } catch (DecryptException $e) {
+                                $relatedField = $record->{$field[1]};
                             }
-
-                            $relatedField = $record->{$field[1]};
                         } else {
                             $relatedField = $record->{$field[1]};
                         }

src/Http/Controllers/QuoteController.php

@@ -336,9 +336,8 @@ public function search(Request $request)
                             try {
                                 $relatedField = decrypt($record->{$field[1]});
                             } catch (DecryptException $e) {
+                                $relatedField = $record->{$field[1]};
                             }
-
-                            $relatedField = $record->{$field[1]};
                         } else {
                             $relatedField = $record->{$field[1]};
                         }