sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

partial #1886 - when a user is outside of delivery range, LET them continue after prompt

Browse Source
This commit is contained in:
Daniel Camargo 2013-11-20 20:32:18 -02:00
parent fb0b3c5ff7
commit e2948b36af
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/views/default/crunchbutton/frontend/restaurant.phtml
View File

@ -410,3 +410,17 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="address-out-of-range-warning order-warning modal zoom-anim-dialog small-container mfp-hide">
<h1>Woops!</h1>
<p>The address <strong>{{order.form.address}}</strong> is out of delivery range, or you have entered an invalid address.<br/><br/>Please check your address, or order takeout.</p>
<ul>
<li>
<div ng-click="addressOutOfRangePlaceAnyway();">Place Order Anyway</div>
</li>
<li>
<div ng-click="addressLetMeChangeIt();">Modify Address</div>
</li>
</ul>
</div>

6
www/assets/css/style.css
View File

@ -257,6 +257,9 @@ html[xmlns] .clearfix {
.order-warning, .order-warning h1{ .order-warning, .order-warning h1{
font-size: 14px !important; font-size: 14px !important;
} }
.order-warning p{
font-size: 12px;
}
.order-warning strong { .order-warning strong {
font-weight: bold; font-weight: bold;
} }
@ -264,12 +267,13 @@ html[xmlns] .clearfix {
margin-top: 10px; margin-top: 10px;
} }
.order-warning ul li { .order-warning ul li {
color: #d74924;
cursor: pointer; cursor: pointer;
margin: 10px 0; margin: 10px 0;
text-decoration: underline; text-decoration: underline;
font-size: 12px;
} }
.show-more-restaurants { .show-more-restaurants {
color: #FFF; color: #FFF;
font-size: 15px; font-size: 15px;

5
www/assets/js/controllers.js
View File

@ -574,6 +574,11 @@ NGApp.controller('RestaurantCtrl', function ($scope, $http, $routeParams, $rootS
// Give time to close the modal. // Give time to close the modal.
setTimeout( function(){ order.submit( true );; }, 300 ); setTimeout( function(){ order.submit( true );; }, 300 );
} }
$scope.addressOutOfRangePlaceAnyway = function(){
$rootScope.closePopup();
// Give time to close the modal.
setTimeout( function(){ order.submit( true );; }, 300 );
}
$scope.giftCardCreditPayment = function(){ $scope.giftCardCreditPayment = function(){
$rootScope.closePopup(); $rootScope.closePopup();

3
www/assets/js/services.order.js
View File

@ -505,7 +505,8 @@ NGApp.factory('OrderService', function ($http, $location, $rootScope, $filter, A
distance = service.location.km2Miles( distance ); distance = service.location.km2Miles( distance );
if (!service.restaurant.deliveryHere(distance)) { if (!service.restaurant.deliveryHere(distance)) {
App.alert('Sorry, you are out of delivery range or have an invalid address. <br>Please check your address, or order takeout.'); App.busy.unBusy();
App.dialog.show( '.address-out-of-range-warning' );
App.busy.unBusy(); App.busy.unBusy();