From 59b7a4459aa9485e5a41e656856c94d474dfe357 Mon Sep 17 00:00:00 2001
From: Ammar-pixel <58658430+Ammar-pixel@users.noreply.github.com>
Date: Thu, 3 Feb 2022 10:19:01 +0800
Subject: [PATCH] Revert "reminder done"

---
 app/Http/Controllers/CheckoutController.php   |  29 ++--
 app/Http/Controllers/ReminderController.php   |  88 -----------
 app/Models/Hour.php                           |   4 +-
 app/Models/Reminder.php                       |  15 --
 ...2_01_202301_create_notifications_table.php |   6 +-
 database/seeders/DatabaseSeeder.php           |   2 -
 database/seeders/ReminderSeeder.php           |  31 ----
 .../views/admin-layouts/editHours.blade.php   |   8 +-
 .../admin-layouts/editReminder.blade.php      | 145 ------------------
 .../views/admin-layouts/reminder.blade.php    |  39 ++---
 routes/web.php                                |   9 +-
 11 files changed, 32 insertions(+), 344 deletions(-)
 delete mode 100644 app/Http/Controllers/ReminderController.php
 delete mode 100644 app/Models/Reminder.php
 delete mode 100644 database/seeders/ReminderSeeder.php
 delete mode 100644 resources/views/admin-layouts/editReminder.blade.php

diff --git a/app/Http/Controllers/CheckoutController.php b/app/Http/Controllers/CheckoutController.php
index 3e22ac5..cb512dd 100644
--- a/app/Http/Controllers/CheckoutController.php
+++ b/app/Http/Controllers/CheckoutController.php
@@ -15,7 +15,7 @@
 use App\Models\User;
 use App\Notifications\SendEmailReminder;
 use Illuminate\Support\Facades\Notification;
-use App\Models\Reminder;
+
 
 class CheckoutController extends Controller
 {
@@ -100,30 +100,21 @@ function orderPlace(Request $req)
         $name = $req->input('O_Name');
         $user = User::where('name', $name)->get();
         
-        $text = Reminder::where('id', 1)->pluck('data');
-        $footer = Reminder::where('id', 1)->pluck('footer');
-        $status = Reminder::where('id', 1)->pluck('status');
-
-        if ($status= 1) {
-
-            $orderData =[
-                'body' => $text,
-                'orderText' => 'Total: RM'.$total.' in AppXilon',
-                'url' => url('/'),
-                'thankyou' => $footer
-            ];
-            Notification::send($user, new SendEmailReminder($orderData));
-        }
-        
+        $orderData =[
+            'body' => 'You Have made an order in AppXilon',
+            'orderText' => 'Total: RM'.$total.' in AppXilon',
+            'url' => url('/'),
+            'thankyou' => 'Thank You For Ordering With AppXilon'
+        ];
+        Notification::send($user, new SendEmailReminder($orderData));
+
         $logs = new Logs;
         $logs->Cust_Id = Auth::id();
         $logs->Log_Module = $req->input('Log_Module');
         $logs->Log_Pay_Type = 0;
-        $logs->Log_Total_Price = $total;
         $logs->Log_Status = $req->input('Log_Status');
         $logs->created_at = Carbon::now();
         $logs->updated_at = Carbon::now();
-        $logs->save();
 
         $cartitems = Cart::where('Cust_Id', Auth::id())->get();
         foreach ($cartitems as $item) {
@@ -194,11 +185,9 @@ public function stripePay(Request $req)
                 $logs->Cust_Id = Auth::id();
                 $logs->Log_Module = $req->input('Log_Module');
                 $logs->Log_Pay_Type = 0;
-                $logs->Log_Total_Price = $total;
                 $logs->Log_Status = $req->input('Log_Status');
                 $logs->created_at = Carbon::now();
                 $logs->updated_at = Carbon::now();
-                $logs->save();
 
                 $cartitems = Cart::where('Cust_Id', Auth::id())->get();
                 foreach ($cartitems as $item) {
diff --git a/app/Http/Controllers/ReminderController.php b/app/Http/Controllers/ReminderController.php
deleted file mode 100644
index 9008140..0000000
--- a/app/Http/Controllers/ReminderController.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\Models\Reminder;
-
-class ReminderController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        $data = Reminder::all();
-        return view('admin-layouts.reminder')->with('reminder',$data);
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(Reminder $reminder)
-    {
-        return view('admin-layouts.editReminder',compact('reminder'));    
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, Reminder $reminder)
-    {
-        //
-        $reminder->update($request->all());
-        return redirect()->route('reminder.index');
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
-    }
-}
diff --git a/app/Models/Hour.php b/app/Models/Hour.php
index 1ca57c8..1425a3c 100644
--- a/app/Models/Hour.php
+++ b/app/Models/Hour.php
@@ -8,9 +8,9 @@
 class Hour extends Model
 {
     public $table = 'business_hour';
-    protected $primaryKey = 'Day_Id';
+    protected $primaryKey = 'day_id';
     protected $fillable = [
-        'Day_Id', 'Day_Of_Week', 'Start_Time', 'End_Time', 'Status'
+        'day_id', 'day_name', 'start_time', 'end_time', 'day_off'
     ];
     public $timestamps = false;
 }
diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php
deleted file mode 100644
index b4737b9..0000000
--- a/app/Models/Reminder.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Reminder extends Model
-{
-    public $table = 'notifications';
-    public $timestamps = TRUE;
-    protected $fillable = [
-        'id', 'status', 'subject', 'data', 'footer'
-    ];
-}
diff --git a/database/migrations/2022_02_01_202301_create_notifications_table.php b/database/migrations/2022_02_01_202301_create_notifications_table.php
index 72d234f..6aa095c 100644
--- a/database/migrations/2022_02_01_202301_create_notifications_table.php
+++ b/database/migrations/2022_02_01_202301_create_notifications_table.php
@@ -14,11 +14,13 @@ class CreateNotificationsTable extends Migration
     public function up()
     {
         Schema::create('notifications', function (Blueprint $table) {
-            $table->bigIncrements('id');
+            $table->uuid('id')->primary();
+            $table->string('type');
             $table->integer('status');
             $table->string('subject');
+            $table->morphs('notifiable');
             $table->text('data');
-            $table->string('footer');
+            $table->timestamp('read_at')->nullable();
             $table->timestamps();
         });
     }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index f01497b..4c5ae2e 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -18,7 +18,6 @@ public function run()
     {
         // \App\Models\Data::factory(10)->create();
         $this->call(UsersSeeder::class);
-        $this->call(AdminSeeder::class);
         $this->call(Product_CategorySeeder::class);
         $this->call(ShopCategorySeeder::class);
         $this->call(ShopInfoSeeder::class);
@@ -34,7 +33,6 @@ public function run()
         $this->call(OrderProductSeeder::class);
         $this->call(ReviewSeeder::class);
         $this->call(ExpensesSeeder::class);
-        $this->call(ReminderSeeder::class);
 
         $seed = new ExpensesSeeder();
         $seed->run();
diff --git a/database/seeders/ReminderSeeder.php b/database/seeders/ReminderSeeder.php
deleted file mode 100644
index 7e19f12..0000000
--- a/database/seeders/ReminderSeeder.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Database\Seeders;
-
-use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\DB;
-
-class ReminderSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        DB:: table('notifications')->insert ([
-            [
-                'id' => '1',
-                'status' => '0',
-                'subject' => 'AppXilon- Booking Reminder',
-                'data' => 'You have made a booking on TAF Bistro.',
-                'footer' => 'Thank You For Ordering With AppXilon',
-                'created_at' => \Carbon\Carbon::now(),
-                'updated_at' => \Carbon\Carbon::now(),
-            ],
-            ]
-        );
-        //
-    }
-}
diff --git a/resources/views/admin-layouts/editHours.blade.php b/resources/views/admin-layouts/editHours.blade.php
index a11d162..7f1c2ad 100644
--- a/resources/views/admin-layouts/editHours.blade.php
+++ b/resources/views/admin-layouts/editHours.blade.php
@@ -68,7 +68,7 @@
                                             <div class="col-md-4 mb-3">
                                                 <label>Start Time:</label>
                                                 <input type="time" class="form-control"
-                                                value="{{ $biz_hour->Start_Time }}" name="Start_Time" Required>
+                                                value="{{ $biz_hour->Start_Time }}" name="start_Time" Required>
                                             </div>
                                         </div>
                                         <div class="form-row">
@@ -80,11 +80,11 @@
                                         </div>
                                         <div class="form-row">
                                                 <label for="example-text-input"
-                                                    class="col-form-label">Status:</label><br>
+                                                    class="col-form-label">Day Off:</label><br>
                                                 <label class="switch">
-                                                    <input type="hidden" value="0" name="status">
+                                                    <input type="hidden" value="0" name="Status">
                                                     <input
-                                                         value="1" type="checkbox" name="status" checked>
+                                                         value="1" type="checkbox" name="Status" checked>
                                                     <span class="slider round"></span>
                                                 </label>
                                         </div>
diff --git a/resources/views/admin-layouts/editReminder.blade.php b/resources/views/admin-layouts/editReminder.blade.php
deleted file mode 100644
index 0af7db7..0000000
--- a/resources/views/admin-layouts/editReminder.blade.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<!doctype html>
-<html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>Edit Reminder</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="shortcut icon" type="image/png" href="{{ asset ('admin-assets/images/icon/favicon.ico')}}">
-    <link rel="stylesheet" href="{{ asset ('admin-assets/css/bootstrap.min.css')}}">
-    <link rel="stylesheet" href="{{ asset ('admin-assets/css/font-awesome.min.css')}}">
-    <link rel="stylesheet" href="{{ asset ('admin-assets/css/themify-icons.css')}}">
-    <link rel="stylesheet" href="{{ asset ('admin-assets/css/metisMenu.css')}}">
-    <link rel="stylesheet" href="{{ asset ('admin-assets/css/owl.carousel.min.css')}}">
-    <link rel="stylesheet" href="{{ asset ('admin-assets/css/slicknav.min.css')}}">
-    <!-- amchart css -->
-    <link rel="stylesheet" href="https://www.amcharts.com/lib/3/plugins/export/export.css" type="text/css" media="all" />
-    <!-- others css -->
-    <link rel="stylesheet" href="{{ asset ('admin-assets/css/typography.css')}}">
-    <link rel="stylesheet" href="{{ asset ('admin-assets/css/default-css.css')}}">
-    <link rel="stylesheet" href="{{ asset ('admin-assets/css/styles.css')}}">
-    <link rel="stylesheet" href="{{ asset ('admin-assets/css/responsive.css')}}">
-    <!-- modernizr css -->
-    <script src="{{asset('admin-assets/js/vendor/modernizr-2.8.3.min.js')}}"></script>
-</head>
-<body>
-    <div class="page-container">
-        @include("admin-include.sidebar") <!-- sidebar menu -->
-        <!-- main content area start -->
-        <div class="main-content">
-            @include('admin-include.header') <!-- header-->
-            <!-- page title area start -->
-            <div class="page-title-area">
-                <div class="row align-items-center">
-                    <div class="col-sm-6">
-                        <div class="breadcrumbs-area clearfix">
-                            <h4 class="page-title pull-left">Dashboard</h4>
-                            <ul class="breadcrumbs pull-left">
-                                <li><a href="index.html">Home</a></li>
-                                <li><span>Edit Reminder</span></li>
-                            </ul>
-                        </div>
-                    </div>
-                    @include("admin-include.adminbar")
-                </div>
-            </div>
-            <!-- page title area end -->
-            <div class="main-content-inner">
-                <div class="row">
-                    <div class="col-lg-12 col-ml-12">
-                        <div class="row">
-                            <form action="{{ route('reminder.update', $reminder->id) }}" method="POST">
-                                @csrf
-                                @method('PUT')
-                                <!-- Textual inputs start -->
-                            <div class="col-lg-12 mt-5" >
-                                <div class="card">
-                                    <div class="card-body">
-                                        <h4 class="header-title">Edit Reminder</h4>
-                                            <div class="form-row">
-                                                <label for="example-text-input"
-                                                    class="col-form-label">Status:</label><br>
-                                                <label class="switch">
-                                                    <input type="hidden" value="0" name="status">
-                                                    <input
-                                                         value="1" type="checkbox" name="status" checked>
-                                                    <span class="slider round"></span>
-                                                </label>
-                                        </div><br>
-                                        <div class="row">
-                                            <div class="col-lg-4 col-md-4 col-sm-6">
-                                                <div class="form-row">
-                                                    <label class="col-form-label">Email Reminder Subject</label>
-                                                </div>
-                                            </div>
-                                            <div class="col-lg-4 col-md-4 col-sm-6">
-                                                <textarea name="subject" rows="4" cols="50" style="height: 200px;">
-                                                    {{$reminder->subject}}
-                                                </textarea>                                       
-                                            </div>
-                                        </div><br>
-                                        <div class="row">
-                                            <div class="col-lg-4 col-md-4 col-sm-6">
-                                                <div class="form-row">
-                                                    <label class="col-form-label">Email Reminder Message</label>
-                                                </div>
-                                            </div>
-                                            <div class="col-lg-4 col-md-4 col-sm-6">
-                                                <textarea name="data" rows="4" cols="50" style="height: 200px;">
-                                                    {{$reminder->data}}
-                                                </textarea>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-lg-4 col-md-4 col-sm-6">
-                                                <div class="form-row">
-                                                    <label class="col-form-label">Email Reminder Footer</label>
-                                                </div>
-                                            </div>
-                                            <div class="col-lg-4 col-md-4 col-sm-6">
-                                                <textarea name="footer" rows="4" cols="50" style="height: 200px;">
-                                                    {{$reminder->footer}}
-                                                </textarea>                                       
-                                            </div><br>
-                                            <div class="col-lg-6 mt-5" style="text-align: center;">
-                                                <button type="submit" style="float: right; margin-right: 10px" 
-                                                class="btn btn-success mb-3" name="upload">Save</button>
-                                            </div>
-                                        </div><br>
-                                    </div>
-                                </div>
-                            </div>
-                            <!-- Textual inputs end -->
-                            </form>                       
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!-- main content area end -->
-        <!-- footer area start-->
-        <footer>
-            <div class="footer-area">
-                <p>© Copyright 2018. All right reserved. Template by <a href="https://colorlib.com/wp/">Colorlib</a>.</p>
-            </div>
-        </footer>
-        <!-- footer area end-->
-    </div>
-    <!-- page container area end -->
-    <!-- offset area start -->
-    <!-- offset area end -->
-    <!-- jquery latest version -->
-    <script src="{{asset('admin-assets/js/vendor/jquery-2.2.4.min.js')}}"></script>
-    <!-- bootstrap 4 js -->
-    <script src="{{asset('admin-assets/js/popper.min.js')}}"></script>
-    <script src="{{asset('admin-assets/js/bootstrap.min.js')}}"></script>
-    <script src="{{asset('admin-assets/js/owl.carousel.min.js')}}"></script>
-    <script src="{{asset('admin-assets/js/metisMenu.min.js')}}"></script>
-    <script src="{{asset('admin-assets/js/jquery.slimscroll.min.js')}}"></script>
-    <script src="{{asset('admin-assets/js/jquery.slicknav.min.js')}}"></script>
-    <!-- others plugins -->
-    <script src="{{asset('admin-assets/js/plugins.js')}}"></script>
-    <script src="{{asset('admin-assets/js/scripts.js')}}"></script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/resources/views/admin-layouts/reminder.blade.php b/resources/views/admin-layouts/reminder.blade.php
index 2ea75f0..46ebcfa 100644
--- a/resources/views/admin-layouts/reminder.blade.php
+++ b/resources/views/admin-layouts/reminder.blade.php
@@ -58,7 +58,6 @@
                         <div class="row">
                             <!-- Textual inputs start -->
                             <div class="col-12 mt-5">
-                                @foreach($reminder as $reminder)
                                 <div class="card">
                                     <div class="card-body">
                                         <h4 class="header-title">Emails</h4>
@@ -69,17 +68,11 @@
                                                 </div>
                                             </div>
                                             <div class="col-lg-2 col-md-4 col-sm-6">
-                                                    @if ($reminder->status == '1')
-                                                    <label class="switch">
-                                                        <input type="checkbox" checked onclick="return false;">
-                                                        <span class="slider round"></span>
-                                                    </label>
-                                                    @else
-                                                    <label class="switch">
-                                                        <input type="checkbox" onclick="return false;">
-                                                        <span class="slider round"></span>
-                                                        @endif
-                                                </div>
+                                                <label class="switch">
+                                                    <input type="checkbox">
+                                                    <span class="slider round"></span>
+                                                  </label>
+                                            </div>
                                         </div><br>
                                         <div class="row">
                                             <div class="col-lg-2 col-md-4 col-sm-6">
@@ -88,9 +81,7 @@
                                                 </div>
                                             </div>
                                             <div class="col-lg-4 col-md-4 col-sm-6">
-                                                <textarea name="w3review" rows="4" cols="50" style="height: 200px;" readonly>{{$reminder->subject}}
-                                                </textarea>                                       
-                                            </div>
+                                                <input class="form-control" type="name" value="" id="example-text-input">                                       </div>
                                         </div><br>
                                         <div class="row">
                                             <div class="col-lg-2 col-md-4 col-sm-6">
@@ -99,27 +90,15 @@
                                                 </div>
                                             </div>
                                             <div class="col-lg-4 col-md-4 col-sm-6">
-                                                <textarea name="w3review" rows="4" cols="50" style="height: 200px;" readonly>{{$reminder->data}}
+                                                <textarea name="w3review" rows="4" cols="50" style="height: 200px;">
                                                 </textarea>
                                             </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-lg-2 col-md-4 col-sm-6">
-                                                <div class="form-row">
-                                                    <label class="col-form-label">Email Reminder Footer</label>
-                                                </div>
-                                            </div>
-                                            <div class="col-lg-4 col-md-4 col-sm-6">
-                                                <textarea name="w3review" rows="4" cols="50" style="height: 200px;" readonly>{{$reminder->footer}}
-                                                </textarea>                                       
-                                            </div><br>
-                                            <div class="col-lg-6 mt-5" style="text-align: center;">
-                                                <a class="btn btn-primary" href="{{ route('reminder.edit', $reminder->id) }}">Edit</a>
+                                            <div class="col-lg-12 mt-5" style="text-align: center;">
+                                                <button type="button" class="btn btn-primary mb-3">Save</button>
                                             </div>
                                         </div><br>
                                     </div>
                                 </div>
-                                @endforeach
                             </div>
                         </div>
                     </div>                       
diff --git a/routes/web.php b/routes/web.php
index 828d178..5a5e040 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -45,7 +45,8 @@
 
 use App\Http\Controllers\EmailController;
 use App\Http\Controllers\ShopCategoryController;
-use App\Http\Controllers\ReminderController;
+
+
 
 /*
 |--------------------------------------------------------------------------
@@ -230,11 +231,9 @@
 
 Route::get('/admin',[UserController::class,'dash']);
 
-/*Route::get('/reminder', function () {
+Route::get('/reminder', function () {
     return view('admin-layouts.reminder');
-});*/
-Route::resource('reminder', ReminderController::class);
-
+});
 Route::get('/res_form', function () {
     return view('admin-layouts.res_form');
 });