From eef2ef9c48718d0224c6044d58f8a3effc15e36c Mon Sep 17 00:00:00 2001 From: arzynik Date: Wed, 7 Nov 2012 13:35:02 -0500 Subject: [PATCH] git ci fixed #507 --- www/assets/js/app.js | 2 +- www/assets/js/restaurant.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/www/assets/js/app.js b/www/assets/js/app.js index 7dd14a7f3..e3f294f50 100644 --- a/www/assets/js/app.js +++ b/www/assets/js/app.js @@ -801,7 +801,7 @@ App.cart = { if (App.restaurant.meetDeliveryMin() && App.order.delivery_type == 'delivery') { $('.delivery-minimum-error').show(); - $('.delivery-min-diff').html(parseFloat(App.restaurant.delivery_min - App.cart.total()).toFixed(2)); + $('.delivery-min-diff').html(App.restaurant.deliveryDiff()); } else { $('.delivery-minimum-error').hide(); diff --git a/www/assets/js/restaurant.js b/www/assets/js/restaurant.js index 7cf412253..fe049e823 100644 --- a/www/assets/js/restaurant.js +++ b/www/assets/js/restaurant.js @@ -33,6 +33,13 @@ var Restaurant = function(id) { } } + self.deliveryDiff = function() { + var total = self.delivery_min_amt == 'subtotal' ? App.cart.subtotal() : App.cart.total(); + var diff = parseFloat(App.restaurant.delivery_min - total).toFixed(2); + /* console.log(App.cart.subtotal(), App.cart.total(),self.delivery_min_amt, total, diff); */ + return diff; + } + self.meetDeliveryMin = function() { var total = self.delivery_min_amt == 'subtotal' ? App.cart.subtotal() : App.cart.total(); return total < parseFloat(self.delivery_min) ? true : false;