diff --git a/app/Http/Controllers/Admin/GiftCardController.php b/app/Http/Controllers/Admin/GiftCardController.php index f5d48e3..9466f9d 100644 --- a/app/Http/Controllers/Admin/GiftCardController.php +++ b/app/Http/Controllers/Admin/GiftCardController.php @@ -34,8 +34,8 @@ class GiftCardController extends Controller 'customer_id' => $customer->id ?? null, 'count' => $count, 'amount' => $amount, - 'mobile' => $request->mobile, - 'name' => $customer ? $customer->name : $request->name, + 'mobile' => $request->mobile ?? null, + 'name' => ($customer ? $customer->name : $request->name) ?? null, 'amount' => $amount, 'total' => $count*$amount, 'sts' => 1, @@ -64,7 +64,7 @@ class GiftCardController extends Controller GiftCardCodes::insert($codes); return response()->json([ - 'customer' => $customer, + 'customer' => $customer ?? null, 'order' => $gift, 'codes' => $gift->giftcardcodes, 'total' => $count*$amount, diff --git a/app/Http/Controllers/Site/ReportController.php b/app/Http/Controllers/Site/ReportController.php index 9939785..d83cc65 100644 --- a/app/Http/Controllers/Site/ReportController.php +++ b/app/Http/Controllers/Site/ReportController.php @@ -135,8 +135,8 @@ class ReportController extends Controller Cnt::where('key', 'goldir_closed')->update(['value' => "true"]); $liman_price = 0; }else{ - Cnt::where('key', 'app_closed')->update(['value' => "true"]); - Cnt::where('key', 'goldir_closed')->update(['value' => "true"]); + Cnt::where('key', 'app_closed')->update(['value' => "false"]); + Cnt::where('key', 'goldir_closed')->update(['value' => "false"]); } }