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

fixed issue #645 - Change "deliver to" to "address"

Browse Source
This commit is contained in:
Stuardo Rodríguez 2013-01-14 12:58:46 -05:00
parent 199bf4d380
commit 6c6cf56172
2 changed files with 676 additions and 676 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/library/Crunchbutton/Order.php
View File

@ -640,7 +640,7 @@ class Crunchbutton_Order extends Cana_Table {
.'</Say><Pause length="1" /><Say voice="'.c::config()->twilio->voice.'"><![CDATA[Customer Name. '.$this->name.'.]]></Say><Pause length="1" /><Say>';
if ($this->delivery_type == 'delivery') {
$msg .= '</Say><Pause length="1" /><Say voice="'.c::config()->twilio->voice.'"><![CDATA[Deliver to '.$this->phoneticStreet($this->address).'.]]>';
$msg .= '</Say><Pause length="1" /><Say voice="'.c::config()->twilio->voice.'"><![CDATA[Address '.$this->phoneticStreet($this->address).'.]]>';
} else {
$msg .= '</Say><Pause length="1" /><Say voice="'.c::config()->twilio->voice.'">This order is for pickup. ';
}

4
www/assets/js/app.js
View File

@ -318,7 +318,7 @@ App.page.restaurant = function(id) {
if (App.config.user.delivery_type == 'delivery' && App.restaurant.delivery == '1') {
dp.append('<div class="dp-display-address dp-display-item"><label>Your food will be delivered to:</label><br />' + (App.config.user.address ? App.config.user.address.replace("\n",'<br />') : '<i>no address provided</i>') + '</div>');
} else {
dp.append('<div class="dp-display-address dp-display-item"><label>Deliver to:</label> <i>takeout</i></div>');
dp.append('<div class="dp-display-address dp-display-item"><label>Address:</label> <i>takeout</i></div>');
}
dp.append('<div class="dp-display-address dp-display-item"><a href="javascript:;"><i>Change delivery or payment details</i></a></div>');
@ -391,7 +391,7 @@ App.drawPay = function(restaurant)
'<label>Phone #</label>' +
'<div class="input-item"><input type="tel" name="pay-phone" tabindex="3"></div><div class="divider"></div>' +
'<label class="delivery-only">Deliver to</label>' +
'<label class="delivery-only">Address</label>' +
'<div class="input-item delivery-only"><textarea name="pay-address" tabindex="4"></textarea></div>' +
fieldError +
'<div class="divider"></div>' +