diff --git a/app/Http/Controllers/APIs/Customer_API/AuthController.php b/app/Http/Controllers/APIs/Customer_API/AuthController.php
index 3427bdc..fbf9620 100644
--- a/app/Http/Controllers/APIs/Customer_API/AuthController.php
+++ b/app/Http/Controllers/APIs/Customer_API/AuthController.php
@@ -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.');
}
},
],
diff --git a/app/Http/Controllers/APIs/RestaurantApi/RestAuthApiController.php b/app/Http/Controllers/APIs/RestaurantApi/RestAuthApiController.php
index 32ec481..cb8a1be 100644
--- a/app/Http/Controllers/APIs/RestaurantApi/RestAuthApiController.php
+++ b/app/Http/Controllers/APIs/RestaurantApi/RestAuthApiController.php
@@ -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..');
}
},
],
diff --git a/app/Services/APIs/CustomerAPIs/RestaurantApiServices.php b/app/Services/APIs/CustomerAPIs/RestaurantApiServices.php
index 36584ca..4ad354f 100644
--- a/app/Services/APIs/CustomerAPIs/RestaurantApiServices.php
+++ b/app/Services/APIs/CustomerAPIs/RestaurantApiServices.php
@@ -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
]
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index 9b91dba..cd84533 100644
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -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.',
];
diff --git a/resources/views/Admin/dashboard.blade.php b/resources/views/Admin/dashboard.blade.php
index a399741..156ea53 100644
--- a/resources/views/Admin/dashboard.blade.php
+++ b/resources/views/Admin/dashboard.blade.php
@@ -45,10 +45,10 @@
{{-- --}}
-
+
-
+
@endif
@@ -291,6 +291,7 @@
Sr no |
Name |
+ Customer Id |
Email |
Count |
Referred Users |
@@ -311,6 +312,7 @@
{{ $loop->iteration }} |
{{ $data['referred_user']['first_name'] }}
{{ $data['referred_user']['last_name'] }} |
+ {{ $data['referred_user']['id'] }} |
{{ $data['referred_user']['email_address'] }} |
{{ count($data['refeers_users']) }}
@@ -356,9 +358,9 @@
- --}}
@@ -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);
});
});
diff --git a/resources/views/Admin/pages/manage_restaurants/add_restaurant.blade.php b/resources/views/Admin/pages/manage_restaurants/add_restaurant.blade.php
index d96ffd7..3aafcff 100644
--- a/resources/views/Admin/pages/manage_restaurants/add_restaurant.blade.php
+++ b/resources/views/Admin/pages/manage_restaurants/add_restaurant.blade.php
@@ -161,7 +161,7 @@
onclick="removeClosedHourEntry(this)">Remove
- |