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

Merge branch 'main' of https://github.com/WDI-Ideas/cheerstothe_season_laravel11 into HritikCheers

Browse Source
This commit is contained in:
Hritikkk9
2024-08-07 11:44:58 +05:30
parent 1b7aa59054 2ba787237b
commit 2feaf50e96
8 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/APIs/Customer_API/AuthController.php
View File

@@ -164,7 +164,7 @@ class AuthController extends Controller
function ($attribute, $value, $fail) {
$existingUser = IamPrincipal::where('email_address', $value)->where('principal_type_xid', 3)->whereNull('deleted_at')->exists();
if (!$existingUser) {
$fail('The selected email address is invalid.');
$fail('Entered e-mail address is not in our system.');
}
},
],

4
app/Http/Controllers/APIs/RestaurantApi/RestAuthApiController.php
View File

@@ -127,9 +127,9 @@ class RestAuthApiController extends Controller
'string',
'email',
function ($attribute, $value, $fail) {
$existingUser = IamPrincipal::where('email_address', $value)->where('principal_type_xid', 4)->whereNull('deleted_at')->exists();
$existingUser = IamPrincipal::where('email_address', $value)->where('principal_type_xid', 4)->where('is_active', 1)->whereNull('deleted_at')->exists();
if (!$existingUser) {
$fail('The selected email address is invalid.');
$fail('Entered e-mail address is not in our system..');
}
},
],

10
app/Services/APIs/CustomerAPIs/RestaurantApiServices.php
View File

@@ -65,7 +65,7 @@ class RestaurantApiServices
$promises[$restaurant['name']] = $client->getAsync('https://maps.googleapis.com/maps/api/place/findplacefromtext/json', [
'query' => [
'fields' => 'place_id',
'input' => $restaurant['name'],
'input' => $restaurant['name'] .' ' . $restaurant['address'],
'inputtype' => 'textquery',
'key' => $googlePlaceApiKey
]
@@ -249,7 +249,7 @@ class RestaurantApiServices
$promises[$res->name] = $client->getAsync('https://maps.googleapis.com/maps/api/place/findplacefromtext/json', [
'query' => [
'fields' => 'place_id',
'input' => $res->name,
'input' => $res->name . ' ' . $res->address,
'inputtype' => 'textquery',
'key' => $googlePlaceApiKey
]
@@ -359,7 +359,7 @@ class RestaurantApiServices
$placeResponse = $client->get('https://maps.googleapis.com/maps/api/place/findplacefromtext/json', [
'query' => [
'fields' => 'place_id',
'input' => $rest->name,
'input' => $rest->name . ' ' . $rest->address,
'inputtype' => 'textquery',
'key' => $googlePlaceApiKey
]
@@ -544,7 +544,7 @@ class RestaurantApiServices
$promises[$res->name] = $client->getAsync('https://maps.googleapis.com/maps/api/place/findplacefromtext/json', [
'query' => [
'fields' => 'place_id',
'input' => $res->name,
'input' => $res->name . ' ' . $res->address,
'inputtype' => 'textquery',
'key' => $googlePlaceApiKey
]
@@ -843,7 +843,7 @@ class RestaurantApiServices
$promises[$restaurant['name']] = $client->getAsync('https://maps.googleapis.com/maps/api/place/findplacefromtext/json', [
'query' => [
'fields' => 'place_id',
'input' => $restaurant['name'],
'input' => $restaurant['name'] . ' ' . $restaurant['address'],
'inputtype' => 'textquery',
'key' => $googlePlaceApiKey
]

1
resources/lang/en/auth.php
View File

@@ -114,6 +114,7 @@ return [
'state_limit_reached' => 'You have reached the maximum limit for redeeming vouchers.',
'restaurant_limit_reached' => 'You have reached the maximum limit for redeeming vouchers.',
'email_already_used' => 'The email address is already in use.',
'invalid_mail' => 'Entered e-mail address is not in our system. Register for an account here.',
];

16
resources/views/Admin/dashboard.blade.php
View File

@@ -45,10 +45,10 @@
<div class="d-flex" style="justify-content: space-between;">
<button id="create_custom_code" type="submit" class="download-btn-custom mt-3 custom-width-10">Update</button>
{{-- <button id="create_custom_code" type="submit" class="download-btn-cancel mt-3 custom-width-10">Deactivate Code</button> --}}
</div>
</form>
@endif
</div>
@@ -291,6 +291,7 @@
</th>
<th class="text-start">Sr no</th>
<th class="text-start">Name</th>
<th class="text-start">Customer Id</th>
<th class="text-start">Email</th>
<th class="text-start">Count</th>
<th class="text-start">Referred Users</th>
@@ -311,6 +312,7 @@
<td class="text-start">{{ $loop->iteration }}</td>
<td class="text-start">{{ $data['referred_user']['first_name'] }}
{{ $data['referred_user']['last_name'] }}</td>
<td class="text-start">{{ $data['referred_user']['id'] }}</td>
<td class="text-start">{{ $data['referred_user']['email_address'] }}</td>
<td class="text-start">
{{ count($data['refeers_users']) }}
@@ -356,9 +358,9 @@
<div class="referral-user-inn-div">
<p><strong>Email:</strong></p><span></span>
</div>
<div class="referral-user-inn-div">
{{-- <div class="referral-user-inn-div">
<p><strong>Referral Code:</strong></p><span></span>
</div>
</div> --}}
<div class="referral-user-inn-div">
<p><strong>Reffered Users:</strong></p><span></span>
</div>
@@ -610,9 +612,9 @@
document.querySelector(
'#referral-user-details-modal .referral-user-inn-div:nth-child(2) span')
.innerText = user.email_address;
document.querySelector(
{{-- document.querySelector(
'#referral-user-details-modal .referral-user-inn-div:nth-child(3) span')
.innerText = user.referral_code;
.innerText = user.referral_code; --}}
// Clear previous referred users
const referredUsersDiv = document.querySelector(
@@ -622,7 +624,7 @@
referredUsers.forEach(referredUser => {
const p = document.createElement('p');
p.innerText =
`${referredUser.first_name} ${referredUser.last_name} (${referredUser.email_address})`;
`${referredUser.first_name} ${referredUser.last_name} (${referredUser.email_address}) (${referredUser.id})`;
referredUsersDiv.appendChild(p);
});
});

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

@@ -161,7 +161,7 @@
onclick="removeClosedHourEntry(this)">Remove</button>
</div>
</div>
<button type="button" onclick="addClosedHourEntry()">Add Time
<button type="button" class="extra-btn" style="float:left;" onclick="addClosedHourEntry()">Add Time
Slot</button>
</div>

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

@@ -242,7 +242,7 @@
</div>
@endforeach
</div>
<button type="button" onclick="addClosedHourEntry()">Add Time
<button type="button" class="extra-btn" style="float:left;" onclick="addClosedHourEntry()">Add Time
Slot</button>
</div>

12
resources/views/Admin/pages/manage_restaurants/view_restaurant.blade.php
View File

@@ -54,7 +54,7 @@
<tr class="title">
<td>Restaurant Name :</td>
<td>Restaurant ID :</td>
<td>Bio :</td>
<td style="min-height:60px; align-items:start;">Bio :</td>
<td>Try on 1 :</td>
<td>Try on 2 :</td>
<td>Try on 3 :</td>
@@ -64,7 +64,7 @@
<tr class="w-100">
<td>{{ $restaurantItem->name }}</td>
<td>{{ $restaurantItem->restaurant_id }}</td>
<td class="text-scrollable">{{ $restaurantItem->bio }}</td>
<td class="text-scrollable" style="height:60px; align-items:start;">{{ $restaurantItem->bio }}</td>
<td class="text-scrollable">{{ $restaurantItem->try_on_1 }}</td>
<td class="text-scrollable">{{ $restaurantItem->try_on_2 }}</td>
<td class="text-scrollable">{{ $restaurantItem->try_on_3 }}</td>
@@ -83,8 +83,8 @@
<tr class="title">
{{-- <td>Description :</td> --}}
<td>Status :</td>
<td>Address :</td>
<td>Exclusion :</td>
<td style="height:60px; align-items:start;">Address :</td>
<td style="height:60px; align-items:start;">Exclusion :</td>
<td>Latitude :</td>
<td>Longitude :</td>
</tr>
@@ -92,9 +92,9 @@
{{-- <td class="text-scrollable">{!! $restaurantItem->description !!}</td> --}}
<td>{{ $restaurantItem->is_active == 1 ? 'Active' : 'Expired' }}
</td>
<td>{{ $restaurantItem->address }}</td>
<td class="text-scrollable" style="height:60px; align-items:start;">{{ $restaurantItem->address }}</td>
<td class="text-scrollable">{{ $restaurantItem->exclusion }}</td>
<td class="text-scrollable" style="height:60px; align-items:start;">{{ $restaurantItem->exclusion }}</td>
<td>{{ $restaurantItem->latitude }}</td>
<td>{{ $restaurantItem->longtitude }}</td>
</tr>