diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 2a0e53e..d5bf7da 100755 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -527,8 +527,17 @@ class PaypalController extends Controller $other_email[] = $userdata->other_email; } + // if ($other_email[0] != null) { + // $other_email = implode(", ", $other_email); + // $email_cc = "orders@merchbay.com" . "," . $other_email; + // } else { + // $email_cc = "orders@merchbay.com"; + // } + if ($other_email[0] != null) { - $other_email = implode(", ", $other_email); + $other_email = implode(", ", array_filter($other_email, function ($value) { + return !is_null($value) && $value !== ''; + })); $email_cc = "orders@merchbay.com" . "," . $other_email; } else { $email_cc = "orders@merchbay.com"; diff --git a/app/Models/paypal/PayPalModel.php b/app/Models/paypal/PayPalModel.php index 9a04e55..28f6030 100755 --- a/app/Models/paypal/PayPalModel.php +++ b/app/Models/paypal/PayPalModel.php @@ -1,51 +1,56 @@ -insertGetId($data); return $i; } - - function insertToOrders($ck){ + + function insertToOrders($ck) + { // $i = DB::table('orders')->insert($data); $pdo = DB::connection()->getPdo(); $query = $pdo->prepare("INSERT INTO orders SELECT * FROM cart_tmp where CartKey = '$ck'"); $i = $query->execute(); - + return $i; } - function insertShippingAddress($data){ + function insertShippingAddress($data) + { $i = DB::table('shipping_addresses')->insert($data); return $i; } - function getLastIdPaymentDetails(){ + function getLastIdPaymentDetails() + { $i = DB::table('payment_details') - ->orderby('Id', 'DESC') - ->take(1) - ->get(); - // var_dump($i); + ->orderby('Id', 'DESC') + ->take(1) + ->get(); return $i; } - function checkCartKey($ck){ + function checkCartKey($ck) + { $i = DB::table('payment_details') - ->where('CartKey', $ck) - // ->take(1) - ->get(); - // var_dump($i); + ->where('CartKey', $ck) + ->get(); return $i; } } diff --git a/resources/views/user-layouts/store_setting.blade.php b/resources/views/user-layouts/store_setting.blade.php index 5ce5232..2a440d1 100755 --- a/resources/views/user-layouts/store_setting.blade.php +++ b/resources/views/user-layouts/store_setting.blade.php @@ -34,7 +34,7 @@
- +