Sayli.Parab/cheerstothe_season_2.0
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Compare commits

base: Sayli.Parab:cb73b533c9f9469228e2b3df0459abb0c4daeebd
Branches Tags
Sayli.Parab:main Sayli.Parab:sayliR Sayli.Parab:SayaliCheers
...
compare: Sayli.Parab:7c9515d6de0b069f8d063ddae2412a47d4054080
Branches Tags
Sayli.Parab:main Sayli.Parab:sayliR Sayli.Parab:SayaliCheers

11 Commits
cb73b533c9 ... 7c9515d6de

Author SHA1 Message Date
sayaliparab
7c9515d6de ContactHistory 2024-06-19 12:53:01 +05:30
sayaliparab
ea23da8aaf ContactHistroy 2024-06-19 12:52:16 +05:30
Sayli Raut
548dcb2ea4 Merge pull request #171 from WDI-Ideas/sayli 
Sayli
 2024-06-18 19:15:45 +05:30
sayliraut
478bb4582e Merge branch 'main' of https://github.com/WDI-Ideas/cheerstothe_season_laravel11 into sayli 2024-06-18 19:15:44 +05:30
sayliraut
c1cb9c37f0 changes 2024-06-18 19:15:31 +05:30
sayliraut
e1f8a46efa Merge branch 'main' of https://github.com/WDI-Ideas/cheerstothe_season_laravel11 into sayli 2024-06-18 17:54:49 +05:30
Sayli Raut
d831740511 Merge pull request #170 from WDI-Ideas/sayli 
Sayli
 2024-06-18 17:54:44 +05:30
sayliraut
c7a57cb115 changes 2024-06-18 17:54:33 +05:30
sayliraut
27f507aae7 Merge branch 'main' of https://github.com/WDI-Ideas/cheerstothe_season_laravel11 into sayli 2024-06-18 15:33:23 +05:30
Sayli Raut
12a80d1d59 Merge pull request #169 from WDI-Ideas/sayli 
Sayli
 2024-06-18 15:33:15 +05:30
sayliraut
ad9d9df3c0 change 2024-06-18 15:33:07 +05:30
11 changed files with 220 additions and 234 deletions
Expand all files Collapse all files

1
app/Http/Controllers/Admin/FaqController.php
View File

@@ -30,6 +30,7 @@ class FaqController extends Controller
public function index()
{
$data = $this->faqServices->viewfaq();
// return $data;
return view('Admin.pages.manage_cms.manage_faq.manage_faq')->with($data);
}
/**

11
app/Http/Controllers/Admin/ManageRestrauntController.php
View File

@@ -11,6 +11,7 @@ use Illuminate\Http\Request;
use Exception;
use App\Helpers\onesignalhelper;
use App\Models\IamPrincipal;
use App\Models\ManageState;
use Illuminate\Support\Facades\Log;
use Maatwebsite\Excel\Facades\Excel;
use Illuminate\Support\Facades\DB;
@@ -44,7 +45,8 @@ class ManageRestrauntController extends Controller
*/
public function add()
{
return view('Admin.pages.manage_restaurants.add_restaurant');
$state = ManageState::where('is_active', 1)->get()->toArray();
return view('Admin.pages.manage_restaurants.add_restaurant', compact('state'));
}
@@ -69,7 +71,6 @@ class ManageRestrauntController extends Controller
// Creating the restaurant
$restaurant = new ManageRestaurant();
$restaurant->name = $request->input('name');
$restaurant->description = $request->input('description');
$restaurant->image = $imagePath;
$restaurant->restaurant_id = $request->input('rest_id');
$restaurant->address = $request->input('address');
@@ -78,6 +79,7 @@ class ManageRestrauntController extends Controller
$restaurant->longtitude = $request->input('longitude');
$restaurant->exclusion = $request->input('exclusion');
$restaurant->phone_number = $request->input('phone_number');
$restaurant->state_xid = $request->input('state_xid');
$restaurant->try_on_1 = $request->input('try_on_1');
$restaurant->try_on_2 = $request->input('try_on_2');
$restaurant->try_on_3 = $request->input('try_on_3');
@@ -136,13 +138,15 @@ class ManageRestrauntController extends Controller
try {
$operating_hours = OperatingHour::where('manage_restaurant_xid', $id)->get()->keyBy('day_of_week');
$restaurantItem = ManageRestaurant::where('id', $id)->first();
$state = ManageState::where('is_active', 1)->get()->toArray();
$restaurantItem['image'] = ListingImageUrl('restaurant_images', $restaurantItem['image']);
return view(
'Admin.pages.manage_restaurants.edit_restaurant',
compact(
'restaurantItem',
'operating_hours'
'operating_hours',
'state'
)
);
} catch (Exception $e) {
@@ -177,6 +181,7 @@ class ManageRestrauntController extends Controller
$restaurant->address = $request->input('location_name');
$restaurant->exclusion = $request->input('exclusion');
$restaurant->phone_number = $request->input('phone_number');
$restaurant->state_xid = $request->input('state_xid');
$restaurant->latitude = $request->input('latitude');
$restaurant->longtitude = $request->input('longitude');
$restaurant->bio = $request->input('bio');

1
app/Models/ManageState.php
View File

@@ -23,6 +23,7 @@ class ManageState extends Model
'deleted_at',
'created_at',
'updated_at',
'state_xid',
];
}

5
app/Services/APIs/CustomerAPIs/CMSApiServices.php
View File

@@ -123,6 +123,11 @@ class CMSApiServices
->get()
->toArray();
$data['restaurant'] = Termsandconditions::select('id', 'message')
->where('category_xid', '2')
->get()
->toArray();
return $data;
} catch (Exception $ex) {
Log::error('Terms and condition Get service failed : ' . $ex->getMessage());

1
database/migrations/2024_05_28_095429_create_manage_restaurants_table.php
View File

@@ -18,6 +18,7 @@ return new class extends Migration
$table->string('name',255)->nullable();
$table->longText('description')->nullable();
$table->string('phone_number', 15)->nullable();
$table->bigInteger('state_xid')->nullable();
$table->string('restaurant_id')->nullable();
$table->string('address',255)->nullable();
$table->string('image')->nullable();

6
public/assets/js/admin/manage_restaurant/add_restaurant.js
View File

@@ -6,7 +6,7 @@ $(document).on("click", "#update_restaurant_btn", function (e) {
name: {
required: true
},
description: {
state_xid: {
required: true,
},
rest_id: {
@@ -55,8 +55,8 @@ $(document).on("click", "#update_restaurant_btn", function (e) {
name: {
required: "Enter restaurant Name",
},
description: {
required: "Enter Description",
state_xid: {
required: "Please Select state",
},
rest_id: {
required: "Enter restaurant Id",

119
resources/views/Admin/pages/manage_cms/manage_faq/manage_faq.blade.php
View File

@@ -35,8 +35,6 @@ $currentPage = 'manage-faq';
}
</style>
<div class="layout-px-spacing">
<div class="middle-content container-xxl p-0">
<div class="row layout-top-spacing">
@@ -45,9 +43,6 @@ $currentPage = 'manage-faq';
<div class="col-md-4">
<h6 class="card-title">Manage FAQ</h6>
</div>
<div class="col-md-8">
</div>
</div>
</div>
<div class="col-xl-12 col-lg-12 col-sm-12 layout-spacing">
@@ -64,7 +59,7 @@ $currentPage = 'manage-faq';
<th class="no-content">Action</th>
</tr>
</thead>
<tbody class="text-center">
<tbody class="text-center" id="faq-tbody">
@foreach ($faq as $index => $faqs)
<tr>
<td class="text-start">{{ $index + 1 }}</td>
@@ -86,50 +81,6 @@ $currentPage = 'manage-faq';
{{ \Carbon\Carbon::parse($faqs['created_at'])->format('d/m/Y') }}
@endif
</td>
<!-- <td>
<div class="dropout">
<button class="more">
<span></span>
<span></span>
<span></span>
</button>
<ul>
<li>
<div class="switch-btn">
<input data-id="{{ $faqs['id'] }}"
{{ $faqs['is_active'] ? 'checked' : '' }} type="checkbox"
class="active_newsletter" id="switch{{ $faqs['id'] }}"
switch="bool" />
<label for="switch{{ $faqs['id'] }}" data-on-label="Active"
data-off-label="Expired"></label>
</div>
</li>
<li>
<a href="#" data-toggle="modal" data-target="#edit-faq-modal"
class="edit-faq-btn" data-faq-id="{{ $faqs['id'] }}"
data-faq-question="{{ $faqs['question'] }}"
data-faq-answer="{{ $faqs['answers'] }}"
data-faq-category="{{ $faqs['faq_category_id'] }}">
<img src="{{ asset('public/assets/img/edit.svg') }}" />
<span>Edit</span>
</a>
</li>
<li>
<a href="#" class="delete-faq-btn"
data-faq-id="{{ $faqs['id'] }}"
data-faq-question="{{ $faqs['question'] }}"
data-faq-answer="{{ $faqs['answers'] }}"
data-faq-category="{{ $faqs['faq_category_id'] }}">
<img src="{{ asset('public/assets/img/delete-recycle.svg') }}" />
<span>Delete</span>
</a>
</li>
</ul>
</div>
</td> -->
<td>
<div class="action-buttons">
<!-- Active Switch Button -->
@@ -141,25 +92,15 @@ $currentPage = 'manage-faq';
<!-- Edit Button -->
<a href="#" data-toggle="modal" data-target="#edit-faq-modal" class="edit-faq-btn" data-faq-id="{{ $faqs['id'] }}" data-faq-question="{{ $faqs['question'] }}" data-faq-answer="{{ $faqs['answers'] }}" data-faq-category="{{ $faqs['faq_category_id'] }}">
<img src="{{ asset('public/assets/img/edit.svg') }}" />
</a>
<!-- Delete Button -->
<!-- <a href="#" class="delete-faq-btn" data-faq-id="{{ $faqs['id'] }}" data-faq-question="{{ $faqs['question'] }}" data-faq-answer="{{ $faqs['answers'] }}" data-faq-category="{{ $faqs['faq_category_id'] }}">
<img src="{{ asset('public/assets/img/delete-recycle.svg') }}" />
<span>Delete</span>
</a> -->
<a href="#" class="delete_about" data-faq-id="{{ $faqs['id'] }}" data-toggle="modal" data-target="#delete-modal">
<img src="{{ asset('public/assets/img/delete-recycle.svg') }}" />
</a>
<input type="hidden" id="delete_about_id">
</div>
</td>
</tr>
@endforeach
</tbody>
@@ -169,8 +110,8 @@ $currentPage = 'manage-faq';
</div>
</div>
</div>
<div class="modal fade" id="add_faq_modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
aria-hidden="true">
<div class="modal fade" id="add_faq_modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-body">
@@ -208,8 +149,8 @@ $currentPage = 'manage-faq';
</div>
</div>
</div>
<div class="modal fade" id="edit-faq-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
aria-hidden="true">
<div class="modal fade" id="edit-faq-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-body">
@@ -224,25 +165,21 @@ $currentPage = 'manage-faq';
<div class="col-md-12 mb-3">
@csrf
<label for="">Question</label>
<input class="form-control" name="question" type="text"
value="{{ $faqs['question'] }}" id="edit-question">
<input class="form-control" name="question" type="text" id="edit-question">
</div>
<input type="hidden" value="{{ $faqs['id'] }}">
<input type="hidden" id="edit-faq-id">
<div class="col-md-12">
<label for="">Answer</label>
<textarea name="answer" id="edit-answer" rows="5" cols="50" class="form-control">{{ $faqs['answers'] }}</textarea>
<textarea name="answer" id="edit-answer" rows="5" cols="50" class="form-control"></textarea>
</div>
<div class="col-md-12">
<label for="add-faq-category">Select Category</label>
<select class="form-control w-30 mr-2 input_class" name="faq_categ" id="add_faq_category">
<select class="form-control w-30 mr-2 input_class" name="faq_categ" id="edit_faq_category">
<option value="">Select</option>
<option value="1" {{ $faqs['faq_category_id'] == 1 ? 'selected' : '' }}>Customer
</option>
<option value="2" {{ $faqs['faq_category_id'] == 2 ? 'selected' : '' }}>
Restaurant</option>
<option value="1">Customer</option>
<option value="2">Restaurant</option>
</select>
</div>
<button type="submit" id="update_faq" class="download-btn-custom mt-4 mx-auto w-25">
<span>Save</span>
</button>
@@ -252,6 +189,7 @@ $currentPage = 'manage-faq';
</div>
</div>
</div>
<div class="modal fade" id="delete-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
@@ -262,31 +200,52 @@ $currentPage = 'manage-faq';
</div>
<div class="modal-body">
<input type="hidden" id="delete_about_id" name="about_id">
<!-- <p class="modal-text">Are you sure you want to<br>Delete </p> -->
<p class="modal-text">Are you sure you ?</p>
<!-- <h6>Are you sure want to delete this content</h6> -->
<div class="modal-btn d-flex">
<a type="button" class="extra-btn" data-dismiss="modal">Cancel</a>
<a type="button" class="download-btn-custom delete_about_button" data-dismiss="modal">Delete</a>
</div>
</div>
</div>
</div>
</div>
@endsection
@section('section_script')
<script src="{{ asset('public/assets/js/admin/manage_cms/manage_faq/main.js') }}"></script>
<script src="{{ asset('public/assets/js/admin/manage_cms/manage_faq/add_faq.js') }}"></script>
<script src="{{ asset('public/assets/js/admin/manage_cms/manage_faq/edit_faq.js') }}"></script>
<script>
$(document).ready(function() {
// Insert Add button
$('<button><a class="extra-btn width-max-content" data-toggle="modal" data-target="#add_faq_modal" href="">Add</a></button>')
.insertBefore("#zero-config_filter label");
// Insert Filter dropdown
$('<select id="filter" class="form-control"><option value="all">All</option><option value="1">Customer</option><option value="2">Restaurant</option></select>')
.insertBefore("#zero-config_filter label");
// Filter FAQ
$('#filter').on('change', function() {
var filterValue = $(this).val();
filterFAQs(filterValue);
});
function filterFAQs(filterValue) {
if (filterValue === "all") {
$("#faq-tbody tr").show();
} else {
$("#faq-tbody tr").each(function() {
var category = $(this).find('td:eq(3)').text().trim();
if ((filterValue == 1 && category === 'Customer') || (filterValue == 2 && category === 'Restaurant')) {
$(this).show();
} else {
$(this).hide();
}
});
}
}
});
</script>
@endsection

21
resources/views/Admin/pages/manage_restaurants/add_restaurant.blade.php
View File

@@ -47,12 +47,6 @@
<input type="text" class="form-control" name="name" required>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="company-name" class="label">Description</label>
<textarea type="text" class="form-control" name="description" required></textarea>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="company-name" class="label">Restaurant ID</label>
@@ -82,6 +76,18 @@
<textarea type="text" class="form-control" name="exclusion"></textarea>
</div>
</div>
<div class="col-md-6">
<label for="location" class="label">Select state</label>
<select class="form-select" aria-label="Default select example" id="single"
name="state_xid">
<option value="">Select State</option>
@foreach ($state as $states)
<option value="{{ $states['id'] }}">{{ $states['name'] }}
</option>
@endforeach
</select>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="location" class="label">Latitude</label>
@@ -97,7 +103,8 @@
<div class="col-md-6">
<div class="form-group ">
<label for="phone_number" class="label">Phone number</label>
<input type="text" class="form-control" name="phone_number" maxlength="15" required>
<input type="text" class="form-control" name="phone_number" maxlength="15"
required>
</div>
</div>
<div class="col-md-6">

30
resources/views/Admin/pages/manage_restaurants/edit_restaurant.blade.php
View File

@@ -50,13 +50,6 @@
maxlength="40" value="{{ $restaurantItem->name }}">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="company-name" class="label">Description</label>
<textarea type="text" class="form-control" name="description">{!! $restaurantItem->description !!}</textarea>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="company-name" class="label">Restaurant ID</label>
@@ -86,8 +79,8 @@
<div class="col-md-6">
<div class="form-group ">
<label for="company-name" class="label">Phone Number</label>
<input type="text" class="form-control" id="phone_number"
name="phone_number" value="{{ $restaurantItem->phone_number }}" maxlength="15">
<input type="text" class="form-control" id="phone_number" name="phone_number"
value="{{ $restaurantItem->phone_number }}" maxlength="15">
</div>
</div>
<div class="col-md-6">
@@ -96,6 +89,19 @@
<textarea type="text" class="form-control" id="exclusion" name="exclusion">{!! $restaurantItem->exclusion !!}</textarea>
</div>
</div>
<div class="col-md-6">
<label for="location" class="label">Select state</label>
<select class="form-select" aria-label="Default select example" id="single"
name="state_xid">
<option value="">Select State</option>
@foreach ($state as $states)
<option value="{{ $states['id'] }}"
@if ($states['id'] == $restaurantItem->state_xid) selected @endif>
{{ $states['name'] }}
</option>
@endforeach
</select>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="company-name" class="label">Latitude</label>
@@ -225,7 +231,7 @@
name: {
required: true
},
description: {
state_xid: {
required: true,
},
rest_id: {
@@ -271,8 +277,8 @@
name: {
required: "Enter restaurant Name",
},
description: {
required: "Enter Description",
state_xid: {
required: "Please select state",
},
rest_id: {
required: "Enter restaurant Id",

110
resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php
View File

@@ -4,6 +4,34 @@
@php
$currentPage = 'manage-customer';
@endphp
<style>
.message {
background-color: #f8f9fa;
border-radius: 10px;
padding: 15px;
margin-bottom: 10px;
}
.reply {
background-color: #e2e3e5;
border-radius: 10px;
padding: 15px;
margin-bottom: 10px;
margin-left: 30px;
}
.message-label {
font-size: 1.1em;
color: #007bff;
}
.reply-label {
font-size: 1.1em;
color: #28a745;
}
.message p, .reply p {
margin: 0;
padding: 0;
}
</style>
<div class="layout-px-spacing">
<div class="middle-content container-xxl p-0">
<div class="row layout-top-spacing ">
@@ -15,107 +43,80 @@ $currentPage = 'manage-customer';
<h6 class="card-title p-0">View Details</h6>
</a>
</div>
<!-- <div class="col-md-8 float-right">
<a class="extra-btn" href="manage-customers.php">
<img class="back-btn" src="../src/assets/img/left-arrow.svg">
Back
</a>
</div> -->
</div>
</div>
<div class="col-xl-12 col-lg-12 col-sm-12 layout-spacing">
<div class="widget-content widget-content-area br-8 position-btn p-0">
<div class="view-details">
<div class="simple-tab">
<!-- <ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="home-tab" data-toggle="tab"
data-target="#home-tab-pane" type="button" role="tab"
aria-controls="home-tab-pane" aria-selected="true">Personal & Medical
details</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="profile-tab" data-toggle="tab"
data-target="#profile-tab-pane" type="button" role="tab"
aria-controls="profile-tab-pane" aria-selected="false">Medical records &
schedules</button>
</li>
</ul> -->
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="home-tab-pane" role="tabpanel" aria-labelledby="home-tab" tabindex="0">
<div class="row">
<div class="col-md-6 mb-10 tabs23">
<table>
<!-- <h4 class="tab-title">Personal information</h4> -->
<tr class="title">
<td>Name :</td>
<td>User ID :</td>
<td>Date of birth :</td>
<!-- <td class="description">Address :</td> -->
<td>Phone Number :</td>
{{-- <td>End Date :</td> --}}
</tr>
<tr class="w-100">
<td>{{ $customers_data->first_name }} {{ $customers_data->last_name }}</td>
<td>{{ $customers_data->id }}</td>
<td>{{ \Carbon\Carbon::parse($customers_data->date_of_birth)->format('d/m/Y') }}
</td>
<td>{{ \Carbon\Carbon::parse($customers_data->date_of_birth)->format('d/m/Y') }}</td>
<td>{{ $customers_data->phone_number }}</td>
{{-- <td>22/10/2023</td> --}}
</tr>
</table>
<a class="download-btn-custom mt-3" href="{{ url('/create-pdf-file', $customers_data->id) }}">
<span>Download user report</span>
<img src="{{ asset('public/assets/img/download.svg') }}" />
</a>
</div>
<div class="col-md-6 mb-10">
<table>
<!-- <h4 class="empty-title"></h4> -->
<tr class="title">
<td>Location :</td>
<td>Email ID :</td>
<td>Contact History : </td>
<td>Onboarded date :</td>
{{-- <td>Location :</td> --}}
{{-- <td>Start Date :</td> --}}
</tr>
<tr class="w-100">
<td>{{ $customers_data->state->name}}</td>
<td>{{ $customers_data->email_address }}</td>
@if($customers_data->contactMessages->isNotEmpty())
@foreach($customers_data->contactMessages as $messages)
<td>{{$messages->message}}</td>
@endforeach
@else
<td>Message is not available</td>
@endif
<td>{{ \Carbon\Carbon::parse($customers_data->created_at)->format('d-m-y') }}</td>
<td>{{ $customers_data->country_xid }}</td>
{{-- <td>03/07/2023</td> --}}
</tr>
</table>
</div>
<div class="col-md-12 mb-10">
<div class="card">
<div class="card-header">
<b> Contact History </b>
</div>
<div class="card-body">
@if($customers_data->contactMessages->isNotEmpty())
@foreach($customers_data->contactMessages as $message)
<div class="message">
<strong>Message:</strong>
<p>{{ $message->message }}</p>
</div>
@if($message->reply_message)
<div class="reply">
<strong>Reply:</strong>
<p>{{ $message->reply_message }}</p>
</div>
@endif
@endforeach
@else
<p>No contact history available.</p>
@endif
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -123,7 +124,6 @@ $currentPage = 'manage-customer';
</div>
@endsection
@section('section_script')
<script src="{{ asset('assets/js/admin/manage_customer/main.js') }}"></script>
@endsection

3
resources/views/frontend/Mail/customer_forgot_password_mail.blade.php
View File

@@ -189,7 +189,7 @@
">
<div class="mktEditable" id="cta">
<ul style="list-style-type: none; padding-left: 0;">
<ul style="padding-left: 20px;">
<li style="font-weight: 500;">One-Time Passcode (OTP) for
verification:</li>
<li style="font-weight: 500;">
@@ -202,6 +202,7 @@
</ul>
</div>
</td>
</tr>
</tbody>