partial #1503 - pre loading user's presets
This commit is contained in:
Daniel Camargo
parent
92e2a13fb1
commit
cf34e204b1
@ -88,7 +88,6 @@
|
||||
<!-- Customizable - select -->
|
||||
<div ng-switch-when="select">
|
||||
<label class="cart-item-customize-select-name">{{option.name}}</label>
|
||||
|
||||
<select ng-change="order.cart.customizeItem(option, item)" ng-model="option.selected" ng-options="opt.id_option as opt.name for opt in option.options" class="cart-customize-select"></select>
|
||||
</div>
|
||||
|
||||
@ -231,18 +230,15 @@
|
||||
</div>
|
||||
|
||||
<label ng-show="order.form.pay_type=='card'">Credit card #</label>
|
||||
<div ng-show="order.form.pay_type=='card'" class="input-item"><input type="tel" name="pay-card-number" tabindex="6" value="{{order.form.card.number}}"></div><div class="divider"></div>
|
||||
<div ng-show="order.form.pay_type=='card'" class="input-item"><input type="tel" name="pay-card-number" tabindex="6" value="{{order.form.cardNumber}}"></div><div class="divider"></div>
|
||||
|
||||
<label ng-show="order.form.pay_type=='card'">Expiration</label>
|
||||
<div ng-show="order.form.pay_type=='card'" class="input-item">
|
||||
<select name="pay-card-month" tabindex="7">
|
||||
<option>Month</option>
|
||||
<option ng-repeat="x in order._months()" value="{{x}}">{{x}}</option>
|
||||
</select>
|
||||
<select name="pay-card-year" tabindex="8">
|
||||
<option>Year</option>
|
||||
<option ng-repeat="x in order._years()" value="{{x}}">{{x}}</option>
|
||||
</select>
|
||||
|
||||
<select ng-model="order.form.cardMonth" ng-options="month.value as month.label for month in order._months()" tabindex="7">{{order.form.card.month}}</select>
|
||||
|
||||
<select ng-model="order.form.cardYear" ng-options="year.value as year.label for year in order._years()" tabindex="8"></select>
|
||||
|
||||
<div class="divider"></div>
|
||||
</div>
|
||||
|
||||
@ -275,7 +271,7 @@
|
||||
|
||||
</form>
|
||||
|
||||
<div ng-show="restaurant._open" class="button-bottom-wrapper" data-role="footer" data-position="fixed"><button class="button-submitorder-form button-bottom"><div>Get Food</div></button></div>
|
||||
<div ng-show="restaurant._open" class="button-bottom-wrapper" data-role="footer" data-position="fixed"><button class="button-bottom" ng-click="order.submit();"><div>Get Food</div></button></div>
|
||||
|
||||
<? /* stored user info */ ?>
|
||||
<div class="delivery-payment-info main-content-readable" ng-show="restaurant._open">
|
||||
|
||||
@ -63,8 +63,11 @@
|
||||
|
||||
<div class="footer">
|
||||
|
||||
<div class="fb-like-mobile fb-like-box" data-href="http://www.facebook.com/crunchbutton" data-width="300" data-show-faces="false" data-stream="false" data-header="false"></div>
|
||||
<!--
|
||||
TODO: remove this comment
|
||||
|
||||
<div class="fb-like-mobile fb-like-box" data-href="http://www.facebook.com/crunchbutton" data-width="300" data-show-faces="false" data-stream="false" data-header="false"></div>
|
||||
-->
|
||||
<div class="footer-content hidden-phone" ng-controller="MainHeaderCtrl">
|
||||
|
||||
<a href="javascript:;" ng-click="navigation.link('/help')">Help</a>
|
||||
|
||||
@ -604,7 +604,7 @@ App.init = function() {
|
||||
$('.cart-item-config a').click(function() {
|
||||
App.cart.customize($(this).closest('.cart-item'));
|
||||
});
|
||||
*/
|
||||
|
||||
$('.button-submitorder-form').click(function(e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
@ -612,7 +612,7 @@ App.init = function() {
|
||||
App.isDeliveryAddressOk = false;
|
||||
App.cart.submit($(this),true);
|
||||
});
|
||||
|
||||
*/
|
||||
$(document).on('click', '.button-deliver-payment, .dp-display-item a, .dp-display-item .clickable', function() {
|
||||
$('.payment-form').show();
|
||||
$('.delivery-payment-info, .content-padder-before').hide();
|
||||
|
||||
@ -220,9 +220,9 @@ NGApp.controller('restaurant', function ($scope, $http, $routeParams, Restaurant
|
||||
|
||||
$scope.restaurant = $scope.restaurantService.restaurant;
|
||||
$scope.order.restaurant = $scope.restaurant;
|
||||
|
||||
$scope.order.init();
|
||||
/*$scope.cart.restaurant = $scope.restaurant;
|
||||
$scope.cart.updateTotal();
|
||||
/*
|
||||
|
||||
$scope.lastOrderDelivery = $scope.service.lastOrderDelivery;
|
||||
$scope.community = $scope.service.community;
|
||||
@ -230,6 +230,10 @@ NGApp.controller('restaurant', function ($scope, $http, $routeParams, Restaurant
|
||||
}
|
||||
});
|
||||
|
||||
$scope.$watch( 'order.cart.items', function( newValue, oldValue, scope ) {
|
||||
$scope.order.updateTotal();
|
||||
}, true);
|
||||
|
||||
$scope.$watch( 'order.cart.items', function( newValue, oldValue, scope ) {
|
||||
$scope.order.updateTotal();
|
||||
}, true);
|
||||
|
||||
@ -1,25 +1,43 @@
|
||||
// CartService service
|
||||
NGApp.factory( 'CartService', function ( RestaurantService ) {
|
||||
|
||||
NGApp.factory('CartService', function (RestaurantService) {
|
||||
var service = {
|
||||
uuidInc: 0,
|
||||
items: {}
|
||||
}
|
||||
|
||||
service.uuid = function () {
|
||||
var id = 'c-' + service.uuidInc;
|
||||
service.uuidInc++;
|
||||
return id;
|
||||
}
|
||||
|
||||
service.add = function (item) {
|
||||
var id = service.uuid(),
|
||||
dish = App.cache('Dish', item);
|
||||
dish_options = dish.options(),
|
||||
options = [];
|
||||
|
||||
if (arguments[1]) {
|
||||
options = arguments[1].options;
|
||||
// This lines above will verify is there are any 'select' option without a selected value
|
||||
for (var i in dish_options) {
|
||||
if (dish_options[i].type == 'select') {
|
||||
var hasSelectedOption = false;
|
||||
var defaultValue = false;
|
||||
for (var j in dish_options) {
|
||||
if (dish_options[j].id_option_parent == dish_options[i].id_option) {
|
||||
if (dish_options[j]['default'] == 1) {
|
||||
defaultValue = dish_options[j]['id_option'];
|
||||
}
|
||||
for (var k in options) {
|
||||
if (options[k] == dish_options[j].id_option) {
|
||||
hasSelectedOption = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (defaultValue && !hasSelectedOption) {
|
||||
options[options.length] = defaultValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (var x in dish_options) {
|
||||
if (dish_options[x]['default'] == 1) {
|
||||
@ -27,65 +45,60 @@ NGApp.factory( 'CartService', function ( RestaurantService ) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
service.items[id] = {};
|
||||
service.items[id].id = item;
|
||||
service.items[id].options = options;
|
||||
|
||||
/* Template viewer stuff */
|
||||
service.items[id].details = {};
|
||||
service.items[id].details.id = id;
|
||||
service.items[id].details.name = dish.name;
|
||||
service.items[id].details.description = dish.description != null ? dish.description : '';
|
||||
|
||||
/* Customization stuff */
|
||||
service.items[id].details.customization = {};
|
||||
service.items[id].details.customization.customizable = ( dish.options().length > 0 );
|
||||
service.items[id].details.customization.expanded = ( parseInt(dish.expand_view ) > 0 );
|
||||
service.items[id].details.customization.options = service._parseCustomOptions( dish_options, options );
|
||||
service.items[id].details.customization.customizable = (dish.options().length > 0);
|
||||
service.items[id].details.customization.expanded = (parseInt(dish.expand_view) > 0);
|
||||
service.items[id].details.customization.options = service._parseCustomOptions(dish_options, options);
|
||||
service.items[id].details.customization.rawOptions = dish_options;
|
||||
|
||||
//TODO:: If it is a mobile add the items at the top #1035
|
||||
|
||||
App.track('Dish added', { id_dish: dish.id_dish, name: dish.name });
|
||||
App.track('Dish added', {
|
||||
id_dish: dish.id_dish,
|
||||
name: dish.name
|
||||
});
|
||||
}
|
||||
|
||||
service.clone = function (item) {
|
||||
var
|
||||
cart = service.items[item],
|
||||
newoptions = [];
|
||||
|
||||
for (var x in cart.options) {
|
||||
newoptions[newoptions.length] = cart.options[x];
|
||||
}
|
||||
service.add(cart.id, { options: newoptions });
|
||||
|
||||
service.add(cart.id, {
|
||||
options: newoptions
|
||||
});
|
||||
App.track('Dish cloned');
|
||||
}
|
||||
|
||||
service.remove = function (item) {
|
||||
App.track('Dish removed');
|
||||
delete service.items[item];
|
||||
}
|
||||
|
||||
service.customizeItem = function (option, item) {
|
||||
var cartitem = service.items[item.details.id];
|
||||
if (option) {
|
||||
if ( option.type == 'select' ) {
|
||||
if (option.type == 'select') {
|
||||
var options = item.details.customization.rawOptions;
|
||||
for (var i in options) {
|
||||
if (options[i].id_option_parent != option.id_option) {
|
||||
continue;
|
||||
}
|
||||
for (var x in cartitem.options) {
|
||||
if ( cartitem.options[x] == options[i].id_option && options[i].id_option_parent == option.id_option ) {
|
||||
if (cartitem.options[x] == options[i].id_option && options[i].id_option_parent == option.id_option) {
|
||||
cartitem.options.splice(x, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
cartitem.options[cartitem.options.length] = option.selected;
|
||||
} else if ( option.type == 'check' ) {
|
||||
} else if (option.type == 'check') {
|
||||
if (option.checked) {
|
||||
cartitem.options[cartitem.options.length] = option.id_option;
|
||||
} else {
|
||||
@ -100,14 +113,12 @@ NGApp.factory( 'CartService', function ( RestaurantService ) {
|
||||
}
|
||||
service.items[item.details.id] = cartitem;
|
||||
}
|
||||
|
||||
service.customizeItemPrice = function (price, force) {
|
||||
if (price != '0.00' || force) {
|
||||
return ' (' + ( (price < 0) ? 'minus $' : '+ $' ) + parseFloat(Math.abs(price)).toFixed(2) + ')';
|
||||
return ' (' + ((price < 0) ? 'minus $' : '+ $') + parseFloat(Math.abs(price)).toFixed(2) + ')';
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
service.getCart = function () {
|
||||
var cart = [];
|
||||
for (x in service.items) {
|
||||
@ -115,22 +126,19 @@ NGApp.factory( 'CartService', function ( RestaurantService ) {
|
||||
}
|
||||
return cart;
|
||||
}
|
||||
|
||||
|
||||
service.hasItems = function () {
|
||||
if (!$.isEmptyObject(service.items)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
service.summary = function(){
|
||||
service.summary = function () {
|
||||
var items = {};
|
||||
for (var x in service.items) {
|
||||
if( items[ service.items[x].details.name ] ){
|
||||
items[ service.items[x].details.name ]++;
|
||||
if (items[service.items[x].details.name]) {
|
||||
items[service.items[x].details.name]++;
|
||||
} else {
|
||||
items[ service.items[x].details.name ] = 1;
|
||||
items[service.items[x].details.name] = 1;
|
||||
}
|
||||
}
|
||||
var text = '';
|
||||
@ -144,16 +152,13 @@ NGApp.factory( 'CartService', function ( RestaurantService ) {
|
||||
}
|
||||
return text.substr(0, text.length - 13);
|
||||
}
|
||||
|
||||
service.subtotal = function () {
|
||||
var
|
||||
total = 0,
|
||||
options;
|
||||
|
||||
for (var x in service.items) {
|
||||
total += parseFloat(App.cached['Dish'][service.items[x].id].price);
|
||||
options = service.items[x].options;
|
||||
|
||||
for (var xx in options) {
|
||||
var option = App.cached['Option'][options[xx]];
|
||||
if (option === undefined) continue; // option does not exist anymore
|
||||
@ -163,59 +168,54 @@ NGApp.factory( 'CartService', function ( RestaurantService ) {
|
||||
total = App.ceil(total);
|
||||
return total;
|
||||
}
|
||||
|
||||
service.totalItems = function(){
|
||||
service.totalItems = function () {
|
||||
var size = 0;
|
||||
for (var x in service.items) {
|
||||
if (service.items.hasOwnProperty(x)){
|
||||
if (service.items.hasOwnProperty(x)) {
|
||||
size++;
|
||||
}
|
||||
}
|
||||
return size;
|
||||
}
|
||||
|
||||
service._parseCustomOptions = function( options, selectedOptions ){
|
||||
|
||||
service._parseCustomOptions = function (options, selectedOptions) {
|
||||
var parsedOptions = [];
|
||||
|
||||
for( var x in options ){
|
||||
for (var x in options) {
|
||||
var newOption = {};
|
||||
var rawOption = options[x];
|
||||
if ( rawOption.id_option_parent ) {
|
||||
if (rawOption.id_option_parent) {
|
||||
continue;
|
||||
}
|
||||
newOption.type = rawOption.type;
|
||||
newOption.id_option = rawOption.id_option;
|
||||
newOption.name = rawOption.name + ( rawOption.description || '' );
|
||||
if( rawOption.type == 'check' ){
|
||||
newOption.name = rawOption.name + (rawOption.description || '');
|
||||
if (rawOption.type == 'check') {
|
||||
newOption.id_option = rawOption.id_option;
|
||||
newOption.price = rawOption.optionPrice(options);
|
||||
newOption.priceFormated = service.customizeItemPrice(newOption.price);
|
||||
newOption.checked = ( $.inArray(rawOption.id_option, selectedOptions) !== -1);
|
||||
newOption.checked = ($.inArray(rawOption.id_option, selectedOptions) !== -1);
|
||||
}
|
||||
if( rawOption.type == 'select' ){
|
||||
if (rawOption.type == 'select') {
|
||||
newOption.options = [];
|
||||
newOption.selected = false;
|
||||
for( var i in options ){
|
||||
for (var i in options) {
|
||||
if (options[i].id_option_parent == rawOption.id_option) {
|
||||
var newSubOption = {};
|
||||
newSubOption.id_option = options[i].id_option;
|
||||
newSubOption.id_option_parent = options[i].id_option_parent;
|
||||
newSubOption.price = options[i].price;
|
||||
newSubOption.priceFormated = service.customizeItemPrice(newSubOption.price);
|
||||
newSubOption.selected = ($.inArray( options[i].id_option, selectedOptions) !== -1);
|
||||
newSubOption.selected = ($.inArray(options[i].id_option, selectedOptions) !== -1);
|
||||
newSubOption.name = options[i].name + (options[i].description || '') + service.customizeItemPrice(newSubOption.price, (rawOption.price_linked == '1'));
|
||||
newOption.options.push( newSubOption );
|
||||
if( newSubOption.selected ){
|
||||
newOption.options.push(newSubOption);
|
||||
if (newSubOption.selected) {
|
||||
newOption.selected = options[i].id_option;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
parsedOptions.push( newOption );
|
||||
parsedOptions.push(newOption);
|
||||
}
|
||||
return parsedOptions;
|
||||
}
|
||||
|
||||
return service;
|
||||
});
|
||||
@ -1,73 +1,77 @@
|
||||
//OrderService Service
|
||||
NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
NGApp.factory('OrderService', function ($http, AccountService, CartService) {
|
||||
var service = {};
|
||||
|
||||
service.account = AccountService;
|
||||
service.cart = CartService;
|
||||
|
||||
service.restaurant = {};
|
||||
|
||||
// Default values
|
||||
service.form = {
|
||||
delivery_type : 'delivery',
|
||||
pay_type : 'card'
|
||||
delivery_type: 'delivery',
|
||||
pay_type: 'card'
|
||||
};
|
||||
|
||||
// Info that will be shown to the user
|
||||
service.info = {
|
||||
dollarSign : '',
|
||||
breakdownDescription : '',
|
||||
extraCharges : '',
|
||||
deliveryMinDiff : '',
|
||||
cartSummary : '',
|
||||
totalText : ''
|
||||
dollarSign: '',
|
||||
breakdownDescription: '',
|
||||
extraCharges: '',
|
||||
deliveryMinDiff: '',
|
||||
cartSummary: '',
|
||||
totalText: ''
|
||||
}
|
||||
|
||||
service.toogleDelivery = function( type ){
|
||||
if( type != service.form.delivery_type ){
|
||||
service.toogleDelivery = function (type) {
|
||||
if (type != service.form.delivery_type) {
|
||||
service.form.delivery_type = type;
|
||||
service.updateTotal();
|
||||
}
|
||||
}
|
||||
|
||||
service.tooglePayment = function( type ){
|
||||
if( type != service.form.pay_type ){
|
||||
service.tooglePayment = function (type) {
|
||||
if (type != service.form.pay_type) {
|
||||
service.form.pay_type = type;
|
||||
service.updateTotal();
|
||||
}
|
||||
}
|
||||
|
||||
service.init = function(){
|
||||
if( App.config.ab && App.config.ab.dollarSign == 'show' ){
|
||||
service.init = function () {
|
||||
if (App.config.ab && App.config.ab.dollarSign == 'show') {
|
||||
service.info.dollarSign = '$';
|
||||
}
|
||||
// Tip stuff
|
||||
if( service.account.user && service.account.user.last_tip ){
|
||||
if (service.account.user && service.account.user.last_tip) {
|
||||
var tip = service.account.user.last_tip;
|
||||
} else{
|
||||
} else {
|
||||
var tip = 'autotip';
|
||||
}
|
||||
service._tipHasChanged = false;
|
||||
service.form.autotip = 0;
|
||||
service.form.tip = service._lastTipNormalize( tip );
|
||||
service.form.tip = service._lastTipNormalize(tip);
|
||||
service.form.name = service.account.user.name;
|
||||
service.form.phone = App.phone.format( service.account.user.phone );
|
||||
service.form.phone = App.phone.format(service.account.user.phone);
|
||||
service.form.address = service.account.user.address;
|
||||
service.form.notes = ( service.account.user && service.account.user.presets && service.account.user.presets[service.restaurant.id_restaurant]) ? service.account.user.presets[service.restaurant.id_restaurant].notes : '';
|
||||
service.form.card = {
|
||||
number: service.account.user.card,
|
||||
month: service.account.user.card_exp_month,
|
||||
year: service.account.user.card_exp_year
|
||||
};
|
||||
service.form.notes = (service.account.user && service.account.user.presets && service.account.user.presets[service.restaurant.id_restaurant]) ? service.account.user.presets[service.restaurant.id_restaurant].notes : '';
|
||||
// Credit card stuff
|
||||
service.form.cardNumber = service.account.user.card;
|
||||
service.form.cardMonth = service.account.user.card_exp_month;
|
||||
service.form.cardYear = service.account.user.card_exp_year;
|
||||
service.updateTotal();
|
||||
}
|
||||
|
||||
// Load the order
|
||||
if( service.cart.hasItems() ){
|
||||
service.reloadOrder();
|
||||
// Load user presets
|
||||
} else if ( service.account.user && service.account.user.presets && service.account.user.presets[service.restaurant.id_restaurant] ) {
|
||||
try {
|
||||
service.loadOrder(service.account.user.presets[service.restaurant.id_restaurant]);
|
||||
} catch (e) {
|
||||
service.loadOrder(service.restaurant.preset());
|
||||
}
|
||||
} else {
|
||||
service.loadOrder(service.restaurant.preset());
|
||||
}
|
||||
}
|
||||
service.reloadOrder = function () {
|
||||
var cart = service.items;
|
||||
service.resetOrder();
|
||||
service.loadFlatOrder(cart);
|
||||
}
|
||||
|
||||
service.loadFlatOrder = function (cart) {
|
||||
for (var x in cart) {
|
||||
service.add(cart[x].id, {
|
||||
@ -75,7 +79,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
service.loadOrder = function (order) {
|
||||
// @todo: convert this to preset object
|
||||
try {
|
||||
@ -87,11 +90,10 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
options[options.length] = dishes[x]['_options'][xx].id_option;
|
||||
}
|
||||
if (App.cached.Dish[dishes[x].id_dish] != undefined) {
|
||||
service.add(dishes[x].id_dish, {
|
||||
service.cart.add(dishes[x].id_dish, {
|
||||
options: options
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
@ -99,7 +101,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
// throw e;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* subtotal, delivery, fee, taxes and tip
|
||||
*
|
||||
@ -108,11 +109,9 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
service.extraChargesText = function (breakdown) {
|
||||
var elements = [];
|
||||
var text = '';
|
||||
|
||||
if (breakdown.delivery) {
|
||||
elements.push(service.info.dollarSign + breakdown.delivery.toFixed(2) + ' delivery');
|
||||
}
|
||||
|
||||
if (breakdown.fee) {
|
||||
elements.push(service.info.dollarSign + breakdown.fee.toFixed(2) + ' fee');
|
||||
}
|
||||
@ -122,7 +121,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
if (breakdown.tip && breakdown.tip > 0) {
|
||||
elements.push(service.info.dollarSign + breakdown.tip + ' tip');
|
||||
}
|
||||
|
||||
if (elements.length) {
|
||||
if (elements.length > 2) {
|
||||
var lastOne = elements.pop();
|
||||
@ -133,11 +131,9 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
}
|
||||
return text;
|
||||
}
|
||||
|
||||
service.subtotal = function () {
|
||||
return service.cart.subtotal();
|
||||
}
|
||||
|
||||
/**
|
||||
* delivery cost
|
||||
*
|
||||
@ -151,7 +147,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
delivery = App.ceil(delivery);
|
||||
return delivery;
|
||||
}
|
||||
|
||||
/**
|
||||
* Crunchbutton service
|
||||
*
|
||||
@ -165,13 +160,11 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
fee = App.ceil(fee);
|
||||
return fee;
|
||||
}
|
||||
|
||||
service._breackDownTaxes = function (feeTotal) {
|
||||
var taxes = (feeTotal * (service.restaurant.tax / 100));
|
||||
taxes = App.ceil(taxes);
|
||||
return taxes;
|
||||
}
|
||||
|
||||
service._breakdownTip = function (total) {
|
||||
var tip = 0;
|
||||
if (service.form.pay_type == 'card') {
|
||||
@ -183,7 +176,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
tip = App.ceil(tip);
|
||||
return tip;
|
||||
}
|
||||
|
||||
service.total = function () {
|
||||
var
|
||||
total = 0,
|
||||
@ -192,7 +184,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
feeTotal = 0,
|
||||
totalItems = 0,
|
||||
finalAmount = 0;
|
||||
|
||||
var breakdown = this.totalbreakdown();
|
||||
total = breakdown.subtotal;
|
||||
feeTotal = total;
|
||||
@ -202,11 +193,8 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
finalAmount += this._breakdownTip(total);
|
||||
return App.ceil(finalAmount).toFixed(2);
|
||||
}
|
||||
|
||||
service.charged = function () {
|
||||
|
||||
var finalAmount = this.total();
|
||||
|
||||
if (App.order.pay_type == 'card' && App.credit.restaurant[service.restaurant.id]) {
|
||||
finalAmount = finalAmount - App.ceil(App.credit.restaurant[service.restaurant.id]).toFixed(2);
|
||||
if (finalAmount < 0) {
|
||||
@ -215,7 +203,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
}
|
||||
return App.ceil(finalAmount).toFixed(2);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the elements that calculates the total
|
||||
*
|
||||
@ -224,11 +211,9 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
* @return array
|
||||
*/
|
||||
service.totalbreakdown = function () {
|
||||
|
||||
var elements = {};
|
||||
var total = this.subtotal();
|
||||
var feeTotal = total;
|
||||
|
||||
elements['subtotal'] = this.subtotal();
|
||||
elements['delivery'] = this._breackDownDelivery();
|
||||
feeTotal += elements['delivery'];
|
||||
@ -238,26 +223,21 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
elements['tip'] = this._breakdownTip(total);
|
||||
return elements;
|
||||
}
|
||||
|
||||
service.resetOrder = function () {
|
||||
service.cart.items = {};
|
||||
}
|
||||
|
||||
/**
|
||||
* Submits the cart order
|
||||
*
|
||||
* @returns void
|
||||
*/
|
||||
service.submit = function () {
|
||||
|
||||
if (App.busy.isBusy()) {
|
||||
return;
|
||||
}
|
||||
|
||||
App.busy.makeBusy();
|
||||
|
||||
// TODO: put it in a service
|
||||
// App.busy.makeBusy();
|
||||
var read = $('.payment-form').length ? true : false;
|
||||
|
||||
if (read) {
|
||||
App.config.user.name = $('[name="pay-name"]').val();
|
||||
App.config.user.phone = $('[name="pay-phone"]').val().replace(/[^\d]*/gi, '');
|
||||
@ -266,7 +246,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
}
|
||||
service.form.tip = $('[name="pay-tip"]').val();
|
||||
}
|
||||
|
||||
var order = {
|
||||
cart: service.getCart(),
|
||||
pay_type: service.form.pay_type,
|
||||
@ -277,12 +256,10 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
lat: (App.loc.pos()) ? App.loc.pos().lat : null,
|
||||
lon: (App.loc.pos()) ? App.loc.pos().lon : null
|
||||
};
|
||||
|
||||
if (order.pay_type == 'card') {
|
||||
order.tip = service.form.tip || '3';
|
||||
order.autotip_value = $('[name=pay-autotip-value]').val();
|
||||
}
|
||||
|
||||
if (read) {
|
||||
order.address = App.config.user.address;
|
||||
order.phone = App.config.user.phone;
|
||||
@ -297,31 +274,23 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
order.card = {};
|
||||
}
|
||||
}
|
||||
|
||||
console.log('ORDER:', order);
|
||||
|
||||
var errors = {};
|
||||
|
||||
if (!order.name) {
|
||||
errors['name'] = 'Please enter your name.';
|
||||
}
|
||||
|
||||
if (!App.phone.validate(order.phone)) {
|
||||
errors['phone'] = 'Please enter a valid phone #.';
|
||||
}
|
||||
|
||||
if (order.delivery_type == 'delivery' && !order.address) {
|
||||
errors['address'] = 'Please enter an address.';
|
||||
}
|
||||
|
||||
if (order.pay_type == 'card' && ((App.order.cardChanged && !order.card.number) || (!App.config.user.id_user && !order.card.number))) {
|
||||
errors['card'] = 'Please enter a valid card #.';
|
||||
}
|
||||
|
||||
if (!service.hasItems()) {
|
||||
errors['noorder'] = 'Please add something to your order.';
|
||||
}
|
||||
|
||||
if (!$.isEmptyObject(errors)) {
|
||||
var error = '';
|
||||
for (var x in errors) {
|
||||
@ -337,31 +306,24 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
}, 'validation error');
|
||||
return;
|
||||
}
|
||||
|
||||
// Play the crunch audio just once, when the user clicks at the Get Food button
|
||||
if (App.iOS() && !App.crunchSoundAlreadyPlayed) {
|
||||
App.playAudio('get-food-audio');
|
||||
App.crunchSoundAlreadyPlayed = true;
|
||||
}
|
||||
|
||||
// if it is a delivery order we need to check the address
|
||||
if (order.delivery_type == 'delivery') {
|
||||
|
||||
// Correct Legacy Addresses in Database to Avoid Screwing Users #1284
|
||||
// If the user has already ordered food
|
||||
if (App.config && App.config.user && App.config.user.last_order) {
|
||||
|
||||
// Check if the order was made at this community
|
||||
if (App.config.user.last_order.communities.indexOf(service.restaurant.id_community) > -1) {
|
||||
|
||||
// Get the last address the user used at this community
|
||||
var lastAddress = App.config.user.last_order.address;
|
||||
var currentAdress = $('[name=pay-address]').val();
|
||||
|
||||
// Make sure the the user address is the same of his last order
|
||||
if ($.trim(lastAddress) != '' && $.trim(lastAddress) == $.trim(currentAdress)) {
|
||||
App.isDeliveryAddressOk = true;
|
||||
|
||||
// Log the legacy address
|
||||
App.log.order({
|
||||
'address': lastAddress,
|
||||
@ -467,7 +429,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
if (order.delivery_type == 'takeout') {
|
||||
App.isDeliveryAddressOk = true;
|
||||
}
|
||||
@ -475,13 +436,11 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
if (!App.isDeliveryAddressOk) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Play the crunch audio just once, when the user clicks at the Get Food button
|
||||
if (!App.crunchSoundAlreadyPlayed) {
|
||||
App.playAudio('get-food-audio');
|
||||
App.crunchSoundAlreadyPlayed = true;
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
url: App.service + 'order',
|
||||
data: order,
|
||||
@ -498,7 +457,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
errors: ['Sorry! Something went horribly wrong trying to place your order!']
|
||||
};
|
||||
}
|
||||
|
||||
if (json.status == 'false') {
|
||||
var error = '';
|
||||
for (x in json.errors) {
|
||||
@ -511,25 +469,18 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
'errors': json.errors
|
||||
}, 'validation error - php');
|
||||
} else {
|
||||
|
||||
if (json.token) {
|
||||
$.totalStorage('token', json.token);
|
||||
}
|
||||
|
||||
$('.link-orders').show();
|
||||
|
||||
order.cardChanged = false;
|
||||
App.justCompleted = true;
|
||||
App.giftcard.notesCode = false;
|
||||
|
||||
var totalItems = 0;
|
||||
|
||||
for (var x in service.items) {
|
||||
totalItems++;
|
||||
}
|
||||
|
||||
$.getJSON('/api/config', App.processConfig);
|
||||
|
||||
App.cache('Order', json.uuid, function () {
|
||||
App.track('Ordered', {
|
||||
'total': this.final_price,
|
||||
@ -541,12 +492,10 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
'user': this.user,
|
||||
'items': totalItems
|
||||
});
|
||||
|
||||
App.order.cardChanged = false;
|
||||
App.loc.changeLocationAddressHasChanged = false;
|
||||
delete tipHasChanged;
|
||||
App.go('/order/' + this.uuid);
|
||||
|
||||
});
|
||||
}
|
||||
setTimeout(function () {
|
||||
@ -554,14 +503,11 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
}, 400);
|
||||
}
|
||||
});
|
||||
|
||||
} // end service.submit()
|
||||
|
||||
service.tipChanged = function(){
|
||||
service.tipChanged = function () {
|
||||
service._tipHasChanged = true;
|
||||
service.updateTotal();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets called after the cart is updarted to refresh the total
|
||||
*
|
||||
@ -569,31 +515,24 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
service.updateTotal = function(){
|
||||
|
||||
service.updateTotal = function () {
|
||||
// Stop runing the method if the restaurant wasn't loaded yet
|
||||
if( !service.restaurant.id_restaurant ){
|
||||
if (!service.restaurant.id_restaurant) {
|
||||
return;
|
||||
}
|
||||
|
||||
service.info.totalText = service.info.dollarSign + service.charged();
|
||||
|
||||
var tipText = '',
|
||||
feesText = '',
|
||||
totalItems = 0,
|
||||
credit = 0,
|
||||
hasFees = ((service.restaurant.delivery_fee && service.form.delivery_type == 'delivery') || service.restaurant.fee_customer) ? true : false;
|
||||
|
||||
if (App.credit.restaurant[service.restaurant.id]) {
|
||||
credit = parseFloat(App.credit.restaurant[service.restaurant.id]);
|
||||
}
|
||||
|
||||
for (var x in service.items) {
|
||||
totalItems++;
|
||||
}
|
||||
|
||||
service._autotip();
|
||||
|
||||
/* If the user changed the delivery method to takeout and the payment is card
|
||||
* the default tip will be 0%. If the delivery method is delivery and the payment is
|
||||
* card the default tip will be autotip.
|
||||
@ -601,23 +540,21 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
*/
|
||||
var wasTipChanged = false;
|
||||
if (service.form.delivery_type == 'takeout' && service.form.pay_type == 'card') {
|
||||
if ( !service._tipHasChanged ) {
|
||||
if (!service._tipHasChanged) {
|
||||
service.form.tip = 0;
|
||||
wasTipChanged = true;
|
||||
}
|
||||
} else if (service.form.delivery_type == 'delivery' && service.form.pay_type == 'card') {
|
||||
if ( !service._tipHasChanged ) {
|
||||
if (!service._tipHasChanged) {
|
||||
service.form.tip = (App.config.user.last_tip) ? App.config.user.last_tip : 'autotip';
|
||||
service.form.tip = service._lastTipNormalize( service.form.tip );
|
||||
service.form.tip = service._lastTipNormalize(service.form.tip);
|
||||
wasTipChanged = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (wasTipChanged) {
|
||||
// Forces the recalculation of total because the tip was changed.
|
||||
service.info.totalText = service.info.dollarSign + this.charged();
|
||||
}
|
||||
|
||||
var _total = service.restaurant.delivery_min_amt == 'subtotal' ? service.subtotal() : service.total();
|
||||
if (service.restaurant.meetDeliveryMin(_total) && service.form.delivery_type == 'delivery') {
|
||||
service.info.deliveryMinDiff = service.restaurant.deliveryDiff(_total);
|
||||
@ -625,10 +562,9 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
service.info.deliveryMinDiff = '';
|
||||
}
|
||||
service.info.totalItems = service.cart.totalItems();
|
||||
service.info.extraCharges = service.extraChargesText( service.totalbreakdown() );
|
||||
service.info.extraCharges = service.extraChargesText(service.totalbreakdown());
|
||||
service.info.breakdownDescription = service.info.dollarSign + this.subtotal().toFixed(2);
|
||||
service.info.cartSummary = service.cart.summary();
|
||||
|
||||
if (App.order.pay_type == 'card' && credit > 0) {
|
||||
var creditLeft = '';
|
||||
if (this.total() < credit) {
|
||||
@ -639,7 +575,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
} else {
|
||||
$('.cart-gift').html('');
|
||||
}
|
||||
|
||||
setTimeout(function () {
|
||||
if (App.order.pay_type == 'cash' && credit > 0 /* && App.giftcard.showGiftCardCashMessage */ ) {
|
||||
$('.cart-giftcard-message').html('<span class="giftcard-payment-message">Pay with a card, NOT CASH, to use your ' + service.info.dollarSign + App.ceil(credit).toFixed(2) + ' gift card!</span>');
|
||||
@ -647,7 +582,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
$('.cart-giftcard-message').html('');
|
||||
}
|
||||
}, 1000);
|
||||
|
||||
/* TODO: find out what this piece of code does
|
||||
$('.cart-item-customize-price').each(function () {
|
||||
var dish = $(this).closest('.cart-item-customize').attr('data-id_cart_item'),
|
||||
@ -660,7 +594,6 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
});
|
||||
*/
|
||||
}
|
||||
|
||||
service._autotip = function () {
|
||||
var subtotal = service.totalbreakdown().subtotal;
|
||||
var autotipValue
|
||||
@ -672,72 +605,87 @@ NGApp.factory( 'OrderService', function( $http, AccountService, CartService ){
|
||||
}
|
||||
service.form.autotip = autotipValue;
|
||||
}
|
||||
|
||||
service._autotipText = function(){
|
||||
service._autotipText = function () {
|
||||
var autotipText = service.form.autotip ? ' (' + service.info.dollarSign + service.form.autotip + ')' : '';
|
||||
return 'Autotip' + autotipText;
|
||||
}
|
||||
|
||||
// Credit card years
|
||||
service._years = function(){
|
||||
var date = new Date().getFullYear();
|
||||
service._years = function () {
|
||||
var years = [];
|
||||
years.push({
|
||||
value: '',
|
||||
label: 'Year'
|
||||
});
|
||||
var date = new Date().getFullYear();
|
||||
for (var x = date; x <= date + 20; x++) {
|
||||
years[years.length] = x;
|
||||
years.push({
|
||||
value: x.toString(),
|
||||
label: x.toString()
|
||||
});
|
||||
}
|
||||
return years;
|
||||
}
|
||||
|
||||
// Credit card months
|
||||
service._months = function(){
|
||||
return [1,2,3,4,5,6,7,8,9,10,11,12];
|
||||
service._months = function () {
|
||||
var months = [];
|
||||
months.push({
|
||||
value: '',
|
||||
label: 'Month'
|
||||
});
|
||||
for (var x = 1; x <= 12; x++) {
|
||||
months.push({
|
||||
value: x.toString(),
|
||||
label: x.toString()
|
||||
});
|
||||
}
|
||||
return months;
|
||||
}
|
||||
|
||||
// Tips
|
||||
service._tips = function(){
|
||||
return [ { value : 'autotip', label : service._autotipText() },
|
||||
{ value : 0, label : 'Tip with cash' },
|
||||
{ value : 10, label : 'tip 10 %' },
|
||||
{ value : 15, label : 'tip 15 %' },
|
||||
{ value : 18, label : 'tip 18 %' },
|
||||
{ value : 20, label : 'tip 20 %' },
|
||||
{ value : 25, label : 'tip 25 %' },
|
||||
{ value : 30, label : 'tip 30 %' }];
|
||||
service._tips = function () {
|
||||
var tips = [];
|
||||
tips.push({
|
||||
value: 'autotip',
|
||||
label: service._autotipText()
|
||||
});
|
||||
tips.push({
|
||||
value: 0,
|
||||
label: 'Tip with cash'
|
||||
});
|
||||
var _tips = [0, 10, 15, 18, 20, 25, 30];
|
||||
for (var x in _tips) {
|
||||
tips.push({
|
||||
value: _tips[x],
|
||||
label: 'tip ' + _tips[x] + ' %'
|
||||
});
|
||||
}
|
||||
|
||||
service._lastTipNormalize = function( lastTip ){
|
||||
return tips;
|
||||
}
|
||||
service._lastTipNormalize = function (lastTip) {
|
||||
/* The default tip is autotip */
|
||||
if( lastTip === 'autotip' ) {
|
||||
if (lastTip === 'autotip') {
|
||||
return lastTip;
|
||||
}
|
||||
if( service.account.user && service.account.user.last_tip_type && service.account.user.last_tip_type == 'number' ){
|
||||
if (service.account.user && service.account.user.last_tip_type && service.account.user.last_tip_type == 'number') {
|
||||
return 'autotip';
|
||||
}
|
||||
// it means the last tipped value is not at the permitted value, return default.
|
||||
lastTip = parseInt( lastTip );
|
||||
lastTip = parseInt(lastTip);
|
||||
var tips = service._tips();
|
||||
for( x in tips ){
|
||||
if( lastTip == parseInt( tips[ x ].value ) ){
|
||||
for (x in tips) {
|
||||
if (lastTip == parseInt(tips[x].value)) {
|
||||
return lastTip;
|
||||
}
|
||||
}
|
||||
return 'autotip';
|
||||
}
|
||||
|
||||
return service;
|
||||
} );
|
||||
|
||||
|
||||
|
||||
});
|
||||
// OrdersService service
|
||||
NGApp.factory('OrdersService', function ($http, $location) {
|
||||
|
||||
var service = {
|
||||
list: false
|
||||
};
|
||||
|
||||
service.all = function () {
|
||||
|
||||
$http.get(App.service + 'user/orders', {
|
||||
cache: true
|
||||
}).success(function (json) {
|
||||
@ -746,35 +694,24 @@ NGApp.factory('OrdersService', function ($http, $location) {
|
||||
}
|
||||
service.list = json;
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
service.restaurant = function (permalink) {
|
||||
$location.path('/' + App.restaurants.permalink + '/' + permalink);
|
||||
};
|
||||
|
||||
service.receipt = function (id_order) {
|
||||
$location.path('/order/' + id_order);
|
||||
};
|
||||
|
||||
return service;
|
||||
|
||||
});
|
||||
|
||||
// OrdersService service
|
||||
NGApp.factory('OrderViewService', function ( $routeParams, $location, $rootScope, FacebookService) {
|
||||
|
||||
NGApp.factory('OrderViewService', function ($routeParams, $location, $rootScope, FacebookService) {
|
||||
var service = {};
|
||||
|
||||
service.facebook = FacebookService;
|
||||
|
||||
App.cache( 'Order', $routeParams.id, function () {
|
||||
App.cache('Order', $routeParams.id, function () {
|
||||
service.order = this;
|
||||
|
||||
var complete = function () {
|
||||
$location.path('/');
|
||||
};
|
||||
|
||||
if (!service.order.uuid) {
|
||||
if (!$rootScope.$$phase) {
|
||||
$rootScope.$apply(complete);
|
||||
@ -783,23 +720,17 @@ NGApp.factory('OrderViewService', function ( $routeParams, $location, $rootScope
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
service.facebook._order_uuid = service.order.uuid;
|
||||
service.facebook.preLoadOrderStatus();
|
||||
|
||||
App.cache('Restaurant', service.order.id_restaurant, function () {
|
||||
|
||||
service.restaurant = this;
|
||||
|
||||
var complete = function () {
|
||||
|
||||
if (service.order['new']) {
|
||||
setTimeout(function () {
|
||||
service.order['new'] = false;
|
||||
}, 500);
|
||||
}
|
||||
};
|
||||
|
||||
if (!$rootScope.$$phase) {
|
||||
$rootScope.$apply(complete);
|
||||
} else {
|
||||
@ -808,5 +739,4 @@ NGApp.factory('OrderViewService', function ( $routeParams, $location, $rootScope
|
||||
});
|
||||
});
|
||||
return service;
|
||||
|
||||
});
|
||||
Loading…
x
Reference in New Issue
Block a user