Version Notes
-Bug fixing
Download this release
Release Info
| Developer | Biztech |
| Extension | order_delivery_date |
| Version | 0.1.8 |
| Comparing to | |
| See all releases | |
Code changes from version 0.1.7 to 0.1.8
- app/code/local/Bc/Deliverydate/etc/config.xml +1 -1
- app/design/frontend/default/default/template/deliverydate/agreements.phtml +2 -2
- app/design/frontend/default/default/template/deliverydate/deliverydate.phtml +41 -63
- app/design/frontend/default/default/template/deliverydate/email/info.phtml +6 -12
- app/design/frontend/default/default/template/deliverydate/order/info.phtml +11 -21
- app/design/frontend/default/default/template/deliverydate/review/info.phtml +11 -11
- app/design/frontend/default/default/template/deliverydate/shipping_method/available.phtml +2 -4
- app/etc/modules/Bc_Deliverydate.xml +1 -1
- package.xml +3 -3
app/code/local/Bc/Deliverydate/etc/config.xml
CHANGED
|
@@ -10,7 +10,7 @@
|
|
| 10 |
<config>
|
| 11 |
<modules>
|
| 12 |
<Bc_Deliverydate>
|
| 13 |
-
<version>0.1.
|
| 14 |
</Bc_Deliverydate>
|
| 15 |
</modules>
|
| 16 |
<frontend>
|
| 10 |
<config>
|
| 11 |
<modules>
|
| 12 |
<Bc_Deliverydate>
|
| 13 |
+
<version>0.1.8</version>
|
| 14 |
</Bc_Deliverydate>
|
| 15 |
</modules>
|
| 16 |
<frontend>
|
app/design/frontend/default/default/template/deliverydate/agreements.phtml
CHANGED
|
@@ -37,8 +37,8 @@
|
|
| 37 |
<form action="" id="checkout-agreements" onsubmit="return false;">
|
| 38 |
<div class="buttons-set arrival-info">
|
| 39 |
<?php
|
| 40 |
-
if
|
| 41 |
-
if(Mage::
|
| 42 |
echo $this->getLayout()->createBlock('core/html_calendar')->setTemplate('deliverydate/js/calendar.phtml')->toHtml() ;
|
| 43 |
echo $this->getLayout()->createBlock('deliverydate/deliverydate')->setTemplate('deliverydate/deliverydate.phtml')->toHtml();
|
| 44 |
}
|
| 37 |
<form action="" id="checkout-agreements" onsubmit="return false;">
|
| 38 |
<div class="buttons-set arrival-info">
|
| 39 |
<?php
|
| 40 |
+
if(Mage::getStoreConfig('deliverydate/deliverydate_general/enabled')){
|
| 41 |
+
if (Mage::getStoreConfig('deliverydate/deliverydate_general/on_which_page')==2){
|
| 42 |
echo $this->getLayout()->createBlock('core/html_calendar')->setTemplate('deliverydate/js/calendar.phtml')->toHtml() ;
|
| 43 |
echo $this->getLayout()->createBlock('deliverydate/deliverydate')->setTemplate('deliverydate/deliverydate.phtml')->toHtml();
|
| 44 |
}
|
app/design/frontend/default/default/template/deliverydate/deliverydate.phtml
CHANGED
|
@@ -1,47 +1,33 @@
|
|
| 1 |
<dd>
|
| 2 |
<ul style="border-top: 1px solid #D1D1D1; margin-top: 12px; padding-top: 10px;">
|
| 3 |
<li>
|
| 4 |
-
<label for="page_date-end"
|
| 5 |
<input name="shipping_arrival_date_display" id="shipping_arrival_date_display" value="" title="date" class=" input-text" style="width: 100px;" type="text"> <img src="<?php echo Mage::getBaseUrl('skin')?>adminhtml/default/default/images/grid-cal.gif" alt="" class="v-middle" id="shipping_arrival_date_trig" title="Select Date" style=""> <a href="javascript:void(0)" id="link_reset" style="margin-left:5px;"><img src="<?php echo $this->getSkinUrl('images/ico_reset.png');?>" alt="" class="v-middle" title="Reset"></a>
|
| 6 |
<input name="shipping_arrival_date" id="shipping_arrival_date" value="" onChange="shippingArrivalDateOnChange(this); return false;" title="date" type="hidden">
|
| 7 |
</li>
|
| 8 |
<li>
|
| 9 |
-
<label for="shipping_arrival_comments"
|
| 10 |
<textarea cols="65" rows="8" name="shipping_arrival_comments" id="shipping_arrival_comments"></textarea></li>
|
| 11 |
<li> <i><?php echo Mage::getStoreConfig('deliverydate/deliverydate_general/deliverydate_html'); ?></i>
|
| 12 |
</li>
|
| 13 |
</dd>
|
| 14 |
<?php
|
| 15 |
-
|
| 16 |
-
$dayoff = Mage::getStoreConfig('deliverydate/deliverydate_dayoff/deliverydate_dayoff');
|
| 17 |
-
$nonworking_days = Mage::helper('deliverydate')->getNonWorkingDays();
|
| 18 |
-
$nonworking_period = Mage::helper('deliverydate')->getNonWorkingPeriod();
|
| 19 |
-
|
| 20 |
-
$day_diff = Mage::getStoreConfig('deliverydate/deliverydate_general/deliverytime_day_diff');
|
| 21 |
-
$start_date = date('Y-m-d H:i:s');
|
| 22 |
-
$end_date = date('Y-m-d H:i:s', strtotime('+'.$day_diff.' days'));
|
| 23 |
-
|
| 24 |
-
$date_from = strtotime(date('Y-m-d', strtotime($start_date)));
|
| 25 |
-
$date_to = strtotime(date('Y-m-d', strtotime($end_date)));
|
| 26 |
-
|
| 27 |
-
for ($i=$date_from; $i<=$date_to; $i+=86400) {
|
| 28 |
-
$non_deliverd_dates[] = date("Y-m-d", $i);
|
| 29 |
-
}
|
| 30 |
-
|
| 31 |
-
foreach($non_deliverd_dates as $non_deliverd_date)
|
| 32 |
-
{
|
| 33 |
-
$non_deliverd_days = array(
|
| 34 |
-
'day' => date('d', strtotime($non_deliverd_date)),
|
| 35 |
-
'month' => date('m', strtotime($non_deliverd_date)),
|
| 36 |
-
'year' => date('Y', strtotime($non_deliverd_date)),
|
| 37 |
-
);
|
| 38 |
-
$non_deliverd_dates_array[] = $non_deliverd_days;
|
| 39 |
-
}
|
| 40 |
-
$off_days = array_merge($nonworking_days,$nonworking_period,$non_deliverd_dates_array);
|
| 41 |
?>
|
| 42 |
|
| 43 |
<script type="text/javascript">
|
| 44 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 45 |
|
| 46 |
Calendar.prototype._init = function (firstDayOfWeek, date) {
|
| 47 |
var today = new CalendarDateObject(),
|
|
@@ -62,8 +48,13 @@
|
|
| 62 |
var month = date.getMonth();
|
| 63 |
var mday = date.getDate();
|
| 64 |
var no_days = date.getMonthDays();
|
|
|
|
| 65 |
var check_flag = false;
|
|
|
|
| 66 |
|
|
|
|
|
|
|
|
|
|
| 67 |
date.setDate(1);
|
| 68 |
var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
|
| 69 |
if (day1 < 0)
|
|
@@ -148,11 +139,13 @@
|
|
| 148 |
check_flag=false;
|
| 149 |
}
|
| 150 |
}else{
|
|
|
|
| 151 |
if (!this.multiple && current_month
|
| 152 |
&& iday == mday && this.hiliteToday) {
|
| 153 |
check_flag=true;
|
| 154 |
}
|
| 155 |
|
|
|
|
| 156 |
}
|
| 157 |
}
|
| 158 |
if (!(hasdays || this.showsOtherMonths))
|
|
@@ -162,16 +155,16 @@
|
|
| 162 |
this.onSetTime();
|
| 163 |
this.table.style.visibility = "visible";
|
| 164 |
this._initMultipleDates();
|
|
|
|
|
|
|
| 165 |
};
|
| 166 |
|
| 167 |
var dayoff = '<?php echo $dayoff; ?>';
|
| 168 |
-
var spe_dayoff = '<?php echo json_encode($off_days); ?>';
|
| 169 |
var test_flag = false;
|
| 170 |
-
var is_time = <?php echo Mage::getStoreConfig('deliverydate/deliverydate_general/deliverytime_enable_time'); ?>;
|
| 171 |
Calendar.setup({
|
| 172 |
inputField: "shipping_arrival_date",
|
| 173 |
ifFormat: "%Y-%mm-%ee %H:%M:%S",
|
| 174 |
-
showsTime:
|
| 175 |
button: "shipping_arrival_date_trig",
|
| 176 |
align: "Bl",
|
| 177 |
singleClick :true,
|
|
@@ -204,14 +197,8 @@
|
|
| 204 |
}
|
| 205 |
else
|
| 206 |
{
|
| 207 |
-
|
| 208 |
-
|
| 209 |
-
document.getElementById('shipping_arrival_date').value=y1+"-"+m1+"-"+d1+" "+h1+":"+min1;
|
| 210 |
-
}else{
|
| 211 |
-
document.getElementById('shipping_arrival_date_display').value=y1+"-"+m1+"-"+d1 ;
|
| 212 |
-
document.getElementById('shipping_arrival_date').value=y1+"-"+m1+"-"+d1 ;
|
| 213 |
-
|
| 214 |
-
}
|
| 215 |
calendar.hide();
|
| 216 |
}
|
| 217 |
}
|
|
@@ -227,36 +214,23 @@
|
|
| 227 |
var d = calendar.date.getDate();
|
| 228 |
|
| 229 |
var day_off_array = dayoff.split(",") ;
|
| 230 |
-
var date_off_array = [];
|
| 231 |
-
|
| 232 |
-
date_off_array[y] = spe_dayoff.evalJSON();
|
| 233 |
|
| 234 |
currentTime = new Date();
|
| 235 |
var d1=currentTime.getDate();
|
| 236 |
var m1=currentTime.getMonth();
|
| 237 |
var y1=currentTime.getFullYear();
|
| 238 |
var counter = 1;
|
| 239 |
-
|
| 240 |
-
|
| 241 |
-
|
| 242 |
-
|
| 243 |
-
|
| 244 |
-
|
| 245 |
-
|
| 246 |
-
if (weekend_days[i] == date.getDay())
|
| 247 |
-
return true;
|
| 248 |
-
if (date_off_array[y])
|
| 249 |
-
{
|
| 250 |
-
for(var j =0;j<=date_off_array[y].length;j++)
|
| 251 |
-
{
|
| 252 |
-
var no_delivery = date_off_array[y][j];
|
| 253 |
-
if (no_delivery){
|
| 254 |
-
|
| 255 |
-
if ((no_delivery['day'] == date.getDate() && no_delivery['month'] == date.getMonth()+1 && no_delivery['year'] == date.getFullYear() ) ||day_off_array[j] == date.getDay())
|
| 256 |
-
return true;
|
| 257 |
}
|
| 258 |
}
|
| 259 |
}
|
|
|
|
| 260 |
if(y < y1)
|
| 261 |
{
|
| 262 |
return true;
|
|
@@ -275,7 +249,13 @@
|
|
| 275 |
displayDate.setValue(date);
|
| 276 |
}
|
| 277 |
|
|
|
|
|
|
|
|
|
|
| 278 |
|
|
|
|
|
|
|
|
|
|
| 279 |
Form.Element.disable('shipping_arrival_date_display');
|
| 280 |
Event.observe($('link_reset'),'click',function(){
|
| 281 |
$('shipping_arrival_date').setValue('');
|
|
@@ -283,5 +263,3 @@
|
|
| 283 |
});
|
| 284 |
//]]>
|
| 285 |
</script>
|
| 286 |
-
|
| 287 |
-
|
| 1 |
<dd>
|
| 2 |
<ul style="border-top: 1px solid #D1D1D1; margin-top: 12px; padding-top: 10px;">
|
| 3 |
<li>
|
| 4 |
+
<label for="page_date-end">Delivery Date:</label>
|
| 5 |
<input name="shipping_arrival_date_display" id="shipping_arrival_date_display" value="" title="date" class=" input-text" style="width: 100px;" type="text"> <img src="<?php echo Mage::getBaseUrl('skin')?>adminhtml/default/default/images/grid-cal.gif" alt="" class="v-middle" id="shipping_arrival_date_trig" title="Select Date" style=""> <a href="javascript:void(0)" id="link_reset" style="margin-left:5px;"><img src="<?php echo $this->getSkinUrl('images/ico_reset.png');?>" alt="" class="v-middle" title="Reset"></a>
|
| 6 |
<input name="shipping_arrival_date" id="shipping_arrival_date" value="" onChange="shippingArrivalDateOnChange(this); return false;" title="date" type="hidden">
|
| 7 |
</li>
|
| 8 |
<li>
|
| 9 |
+
<label for="shipping_arrival_comments">Delivery Comments:</label><br/>
|
| 10 |
<textarea cols="65" rows="8" name="shipping_arrival_comments" id="shipping_arrival_comments"></textarea></li>
|
| 11 |
<li> <i><?php echo Mage::getStoreConfig('deliverydate/deliverydate_general/deliverydate_html'); ?></i>
|
| 12 |
</li>
|
| 13 |
</dd>
|
| 14 |
<?php
|
| 15 |
+
$dayoff = Mage::getStoreConfig('deliverydate/deliverydate_general/deliverydate_dayoff');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 16 |
?>
|
| 17 |
|
| 18 |
<script type="text/javascript">
|
| 19 |
+
//<![CDATA[
|
| 20 |
+
/*Calendar.setup({
|
| 21 |
+
inputField: "shipping_arrival_date",
|
| 22 |
+
ifFormat: "%m/%e/%Y",
|
| 23 |
+
showsTime: false,
|
| 24 |
+
button: "shipping_arrival_date_trig",
|
| 25 |
+
align: "Bl",
|
| 26 |
+
singleClick : true ,
|
| 27 |
+
disableFunc: function(date) {
|
| 28 |
+
return date.getMonth() === 1; // Sunday is 0, Monday is 1, and so on
|
| 29 |
+
}
|
| 30 |
+
});*/
|
| 31 |
|
| 32 |
Calendar.prototype._init = function (firstDayOfWeek, date) {
|
| 33 |
var today = new CalendarDateObject(),
|
| 48 |
var month = date.getMonth();
|
| 49 |
var mday = date.getDate();
|
| 50 |
var no_days = date.getMonthDays();
|
| 51 |
+
/* Added By B.C. on date 18/02/2013 */
|
| 52 |
var check_flag = false;
|
| 53 |
+
/* END */
|
| 54 |
|
| 55 |
+
// calendar voodoo for computing the first day that would actually be
|
| 56 |
+
// displayed in the calendar, even if it's from the previous month.
|
| 57 |
+
// WARNING: this is magic. ;-)
|
| 58 |
date.setDate(1);
|
| 59 |
var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
|
| 60 |
if (day1 < 0)
|
| 139 |
check_flag=false;
|
| 140 |
}
|
| 141 |
}else{
|
| 142 |
+
/* Added By B.C. on date 18/02/2013 */
|
| 143 |
if (!this.multiple && current_month
|
| 144 |
&& iday == mday && this.hiliteToday) {
|
| 145 |
check_flag=true;
|
| 146 |
}
|
| 147 |
|
| 148 |
+
/* END */
|
| 149 |
}
|
| 150 |
}
|
| 151 |
if (!(hasdays || this.showsOtherMonths))
|
| 155 |
this.onSetTime();
|
| 156 |
this.table.style.visibility = "visible";
|
| 157 |
this._initMultipleDates();
|
| 158 |
+
// PROFILE
|
| 159 |
+
// this.tooltips.innerHTML = "Generated in " + ((new CalendarDateObject()) - today) + " ms";
|
| 160 |
};
|
| 161 |
|
| 162 |
var dayoff = '<?php echo $dayoff; ?>';
|
|
|
|
| 163 |
var test_flag = false;
|
|
|
|
| 164 |
Calendar.setup({
|
| 165 |
inputField: "shipping_arrival_date",
|
| 166 |
ifFormat: "%Y-%mm-%ee %H:%M:%S",
|
| 167 |
+
showsTime: true,
|
| 168 |
button: "shipping_arrival_date_trig",
|
| 169 |
align: "Bl",
|
| 170 |
singleClick :true,
|
| 197 |
}
|
| 198 |
else
|
| 199 |
{
|
| 200 |
+
document.getElementById('shipping_arrival_date_display').value=y1+"-"+m1+"-"+d1+" "+h1+":"+min1;
|
| 201 |
+
document.getElementById('shipping_arrival_date').value=y1+"-"+m1+"-"+d1+" "+h1+":"+min1;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 202 |
calendar.hide();
|
| 203 |
}
|
| 204 |
}
|
| 214 |
var d = calendar.date.getDate();
|
| 215 |
|
| 216 |
var day_off_array = dayoff.split(",") ;
|
|
|
|
|
|
|
|
|
|
| 217 |
|
| 218 |
currentTime = new Date();
|
| 219 |
var d1=currentTime.getDate();
|
| 220 |
var m1=currentTime.getMonth();
|
| 221 |
var y1=currentTime.getFullYear();
|
| 222 |
var counter = 1;
|
| 223 |
+
for (var i=0; i<day_off_array.length;i++){
|
| 224 |
+
if (day_off_array[i]>=0 && day_off_array[i]!=''){
|
| 225 |
+
if (date.getDay()==day_off_array[i]){
|
| 226 |
+
if (date.getDate()==currentTime.getDate()){
|
| 227 |
+
test_flag=true;
|
| 228 |
+
}
|
| 229 |
+
return true;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 230 |
}
|
| 231 |
}
|
| 232 |
}
|
| 233 |
+
|
| 234 |
if(y < y1)
|
| 235 |
{
|
| 236 |
return true;
|
| 249 |
displayDate.setValue(date);
|
| 250 |
}
|
| 251 |
|
| 252 |
+
function resetArrivalDate()
|
| 253 |
+
{
|
| 254 |
+
//clear both fields
|
| 255 |
|
| 256 |
+
}
|
| 257 |
+
//MRD added disable field to only allow calendar input
|
| 258 |
+
//TODO: need to enable field when form is submitted
|
| 259 |
Form.Element.disable('shipping_arrival_date_display');
|
| 260 |
Event.observe($('link_reset'),'click',function(){
|
| 261 |
$('shipping_arrival_date').setValue('');
|
| 263 |
});
|
| 264 |
//]]>
|
| 265 |
</script>
|
|
|
|
|
|
app/design/frontend/default/default/template/deliverydate/email/info.phtml
CHANGED
|
@@ -4,20 +4,14 @@
|
|
| 4 |
$time_format = Mage::getStoreConfig('deliverydate/deliverydate_general/deliverytime_format');
|
| 5 |
if ($date_format=='')
|
| 6 |
$date_format='d/M/Y';
|
| 7 |
-
if($time_format=='')
|
| 8 |
$date_format.=" ,g:i a";
|
| 9 |
-
}else{
|
| 10 |
-
$is_time = Mage::getStoreConfig('deliverydate/deliverydate_general/deliverytime_enable_time');
|
| 11 |
-
if($is_time){
|
| 12 |
-
$date_format.=" ".$time_format;
|
| 13 |
-
}else{
|
| 14 |
-
$date_format.=" ";
|
| 15 |
-
}
|
| 16 |
-
}
|
| 17 |
-
if ($_order->getShippingArrivalDate()!='')
|
| 18 |
-
echo "<strong>Shipping Arrival Date :- </strong>".$currentDate = date ($date_format,strtotime($_order->getShippingArrivalDate()));
|
| 19 |
else
|
| 20 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 21 |
if ($_order->getShippingArrivalComments()!='')
|
| 22 |
echo "<br/>".$_order->getShippingArrivalComments();
|
| 23 |
?>
|
| 4 |
$time_format = Mage::getStoreConfig('deliverydate/deliverydate_general/deliverytime_format');
|
| 5 |
if ($date_format=='')
|
| 6 |
$date_format='d/M/Y';
|
| 7 |
+
if($time_format=='')
|
| 8 |
$date_format.=" ,g:i a";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 9 |
else
|
| 10 |
+
$date_format.=" ".$time_format;
|
| 11 |
+
if ($_order->getShippingArrivalDate()!='')
|
| 12 |
+
echo "<strong>Shipping Arrival Date :- </strong>".$currentDate = date ($date_format,strtotime($_order->getShippingArrivalDate()));
|
| 13 |
+
else
|
| 14 |
+
echo "<strong>Shipping Arrival Date :- </strong> N/A";
|
| 15 |
if ($_order->getShippingArrivalComments()!='')
|
| 16 |
echo "<br/>".$_order->getShippingArrivalComments();
|
| 17 |
?>
|
app/design/frontend/default/default/template/deliverydate/order/info.phtml
CHANGED
|
@@ -72,35 +72,25 @@
|
|
| 72 |
<?php echo $this->escapeHtml($_order->getShippingDescription()); ?>
|
| 73 |
<br/>
|
| 74 |
<?php
|
| 75 |
-
|
| 76 |
-
|
| 77 |
-
$shipping_arrival_date = $_order->getShippingArrivalDate();
|
| 78 |
-
|
| 79 |
$date_format = Mage::getStoreConfig('deliverydate/deliverydate_general/deliverydate_format');
|
| 80 |
$time_format = Mage::getStoreConfig('deliverydate/deliverydate_general/deliverytime_format');
|
| 81 |
-
if ($date_format=='')
|
| 82 |
$date_format='d/M/Y';
|
| 83 |
-
|
| 84 |
-
if($time_format==''){
|
| 85 |
$date_format.=" ,g:i a";
|
| 86 |
-
|
| 87 |
-
$
|
| 88 |
-
if($is_time){
|
| 89 |
-
$date_format.=" ".$time_format;
|
| 90 |
-
}else{
|
| 91 |
-
$date_format.=" ";
|
| 92 |
-
}
|
| 93 |
-
}
|
| 94 |
if ($shipping_arrival_date!='')
|
| 95 |
echo "Shipping Arrival Date :- ".$currentDate = date ($date_format,strtotime($shipping_arrival_date));
|
| 96 |
else
|
| 97 |
echo "Shipping Arrival Date :- N/A";
|
| 98 |
-
|
| 99 |
-
|
| 100 |
-
|
| 101 |
-
|
| 102 |
-
|
| 103 |
-
}
|
| 104 |
?>
|
| 105 |
<?php else: ?>
|
| 106 |
<p><?php echo $this->helper('sales')->__('No shipping information available'); ?></p>
|
| 72 |
<?php echo $this->escapeHtml($_order->getShippingDescription()); ?>
|
| 73 |
<br/>
|
| 74 |
<?php
|
| 75 |
+
$shipping_arrival_date = $_order->getShippingArrivalDate();
|
| 76 |
+
|
|
|
|
|
|
|
| 77 |
$date_format = Mage::getStoreConfig('deliverydate/deliverydate_general/deliverydate_format');
|
| 78 |
$time_format = Mage::getStoreConfig('deliverydate/deliverydate_general/deliverytime_format');
|
| 79 |
+
if ($date_format=='')
|
| 80 |
$date_format='d/M/Y';
|
| 81 |
+
if($time_format=='')
|
|
|
|
| 82 |
$date_format.=" ,g:i a";
|
| 83 |
+
else
|
| 84 |
+
$date_format.=" ".$time_format;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 85 |
if ($shipping_arrival_date!='')
|
| 86 |
echo "Shipping Arrival Date :- ".$currentDate = date ($date_format,strtotime($shipping_arrival_date));
|
| 87 |
else
|
| 88 |
echo "Shipping Arrival Date :- N/A";
|
| 89 |
+
?>
|
| 90 |
+
<br/>
|
| 91 |
+
<?php
|
| 92 |
+
if ($_order->getShippingArrivalComments()!='')
|
| 93 |
+
echo $_order->getShippingArrivalComments();
|
|
|
|
| 94 |
?>
|
| 95 |
<?php else: ?>
|
| 96 |
<p><?php echo $this->helper('sales')->__('No shipping information available'); ?></p>
|
app/design/frontend/default/default/template/deliverydate/review/info.phtml
CHANGED
|
@@ -70,19 +70,19 @@
|
|
| 70 |
<div id="checkout-review-submit">
|
| 71 |
<?php echo $this->getChildHtml('agreements') ?>
|
| 72 |
<?php if (version_compare(Mage::getVersion(), '1.5.1.0', '>')) { ?>
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
| 77 |
-
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
|
| 83 |
<script type="text/javascript">
|
| 84 |
//<![CDATA[
|
| 85 |
-
|
| 86 |
//]]>
|
| 87 |
</script>
|
| 88 |
</div>
|
| 70 |
<div id="checkout-review-submit">
|
| 71 |
<?php echo $this->getChildHtml('agreements') ?>
|
| 72 |
<?php if (version_compare(Mage::getVersion(), '1.5.1.0', '>')) { ?>
|
| 73 |
+
<div class="buttons-set" id="review-buttons-container">
|
| 74 |
+
|
| 75 |
+
<p class="f-left"><?php echo $this->__('Forgot an Item?') ?> <a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo $this->__('Edit Your Cart') ?></a></p>
|
| 76 |
+
|
| 77 |
+
<?php echo $this->getChildHtml('button') ?>
|
| 78 |
+
<span class="please-wait" id="review-please-wait" style="display:none;">
|
| 79 |
+
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Submitting order information...') ?>" title="<?php echo $this->__('Submitting order information...') ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
|
| 80 |
+
</span>
|
| 81 |
+
</div>
|
| 82 |
+
<?php } ?>
|
| 83 |
<script type="text/javascript">
|
| 84 |
//<![CDATA[
|
| 85 |
+
review = new Review('<?php echo $this->getUrl('checkout/onepage/saveOrder', array('form_key' => Mage::getSingleton('core/session')->getFormKey())) ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
|
| 86 |
//]]>
|
| 87 |
</script>
|
| 88 |
</div>
|
app/design/frontend/default/default/template/deliverydate/shipping_method/available.phtml
CHANGED
|
@@ -71,10 +71,8 @@
|
|
| 71 |
</dd>
|
| 72 |
<?php endforeach; ?>
|
| 73 |
<?php
|
| 74 |
-
if (
|
| 75 |
-
|
| 76 |
-
echo $this->getLayout()->createBlock('deliverydate/deliverydate')->setTemplate('deliverydate/deliverydate.phtml')->toHtml();
|
| 77 |
-
}
|
| 78 |
}
|
| 79 |
?>
|
| 80 |
</dl>
|
| 71 |
</dd>
|
| 72 |
<?php endforeach; ?>
|
| 73 |
<?php
|
| 74 |
+
if (Mage::getStoreConfig('deliverydate/deliverydate_general/on_which_page')==1){
|
| 75 |
+
echo $this->getLayout()->createBlock('deliverydate/deliverydate')->setTemplate('deliverydate/deliverydate.phtml')->toHtml();
|
|
|
|
|
|
|
| 76 |
}
|
| 77 |
?>
|
| 78 |
</dl>
|
app/etc/modules/Bc_Deliverydate.xml
CHANGED
|
@@ -10,7 +10,7 @@
|
|
| 10 |
<config>
|
| 11 |
<modules>
|
| 12 |
<Bc_Deliverydate>
|
| 13 |
-
<active>
|
| 14 |
<codePool>local</codePool>
|
| 15 |
</Bc_Deliverydate>
|
| 16 |
</modules>
|
| 10 |
<config>
|
| 11 |
<modules>
|
| 12 |
<Bc_Deliverydate>
|
| 13 |
+
<active>true</active>
|
| 14 |
<codePool>local</codePool>
|
| 15 |
</Bc_Deliverydate>
|
| 16 |
</modules>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>order_delivery_date</name>
|
| 4 |
-
<version>0.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -16,8 +16,8 @@ Our extension will override files to display delivery date with order informatio
|
|
| 16 |
<notes>-Bug fixing</notes>
|
| 17 |
<authors><author><name>Biztech</name><user>biztechcon</user><email>sales@biztechconsultancy.com</email></author></authors>
|
| 18 |
<date>2014-02-13</date>
|
| 19 |
-
<time>
|
| 20 |
-
<contents><target name="mageetc"><dir name="modules"><file name="Bc_Deliverydate.xml" hash="
|
| 21 |
<compatible/>
|
| 22 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
| 23 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>order_delivery_date</name>
|
| 4 |
+
<version>0.1.8</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 16 |
<notes>-Bug fixing</notes>
|
| 17 |
<authors><author><name>Biztech</name><user>biztechcon</user><email>sales@biztechconsultancy.com</email></author></authors>
|
| 18 |
<date>2014-02-13</date>
|
| 19 |
+
<time>12:00:07</time>
|
| 20 |
+
<contents><target name="mageetc"><dir name="modules"><file name="Bc_Deliverydate.xml" hash="55c1feba29d59d4c341e5fca0e771df7"/></dir></target><target name="magelocal"><dir name="Bc"><dir name="Deliverydate"><dir name="Block"><dir name="Adminhtml"><dir name="Deliverydate"><dir name="Edit"><file name="Form.php" hash="14a5ef75f43be68f966b4233d1a71707"/><dir name="Tab"><file name="Form.php" hash="eb392c359eafe55fa4af49726e38d25d"/></dir><file name="Tabs.php" hash="4dae864023de48414f5c5de48961dbb2"/></dir><file name="Edit.php" hash="b990ba5c1f8bc9c9e8796f4b0fe45ab2"/><file name="Grid.php" hash="1033c40acfc04c6d9b2827f3b1664fef"/></dir><file name="Deliverydate.php" hash="da2c1c11742280cbdad8a6789d8e710f"/></dir><file name="Deliverydate.php" hash="2e5ea173382e8fd75165b8bee4cfb409"/><dir name="Email"><file name="Info.php" hash="77175f966ef7fe9414bfbb1592f651ff"/></dir><dir name="Order"><file name="Info.php" hash="73d4b23927c7531e489eb6a806934b44"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d0b7cdd924cf7ff3947088d4e8e10910"/></dir><dir name="Model"><dir name="Config"><file name="Dateformat.php" hash="722f44d3c607a2e0f172f8b2721405fe"/><file name="Dayoff.php" hash="be7e72edca44e8cee607972cde0e1565"/><file name="Option.php" hash="45780922eac613f1a6a03ced8af080ec"/><file name="Timeformat.php" hash="19b1013107a87923bdc2b962dae844ec"/></dir><file name="Deliverydate.php" hash="d6d63e0c5db21a706ec7353b307f8a95"/><dir name="Mysql4"><dir name="Deliverydate"><file name="Collection.php" hash="38e5fa717318b2fc9d18eca3db6b0e8b"/></dir><file name="Deliverydate.php" hash="5dee427cc09c3659a76a32a6ec13cade"/></dir><file name="Observer.php" hash="bdde7329038961889cec689dcf563004"/><file name="Status.php" hash="334c9b7669e215314b32e9cbcff89354"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="DeliverydateController.php" hash="a33ab0d29a473dbc421aef1df67d301f"/></dir><file name="IndexController.php" hash="4066dfbe772492393bf98a127af7bc2d"/></dir><dir name="etc"><file name="config.xml" hash="ef9f85146a06542ac17ef00c5a8ee9c4"/><file name="system.xml" hash="adf832b092bdafb35a59d5b71e7601d2"/></dir><dir name="sql"><dir name="deliverydate_setup"><file name="mysql4-install-0.1.0.php" hash="d03f13d84464f407844bee55dc930d60"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="deliverydate.xml" hash="1a93a596b5a279a9a8b688a02211f010"/></dir><dir name="template"><dir name="deliverydate"><file name="agreements.phtml" hash="b54d092b98c18bff9176bbb9473262a9"/><file name="deliverydate.phtml" hash="9efec3e9eb4302d49bdf29552ba484a5"/><dir><dir name="email"><file name="info.phtml" hash="6fdbc376e648bd328a9167dd08c8cc5b"/></dir><dir name="js"><file name="calendar.phtml" hash="0cf736ac3f11475c3b20ce008791ce30"/></dir><dir name="order"><file name="info.phtml" hash="03a790d8ec056ae0446afc78247e410d"/></dir><dir name="review"><file name="info.phtml" hash="c64fa146f4e8eceb489e26a509f084f7"/></dir><dir name="shipping_method"><file name="available.phtml" hash="0d7ab3fd3d976cc90ddba322d3c8737e"/></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="deliverydate.xml" hash="28218a2131b1b68e4ad0acf9aa0b559c"/></dir><dir name="template"><dir name="deliverydate"><file name="date.phtml" hash="865e5602821db004e5fdbdf227612e49"/><file name="info.phtml" hash="1a2fe215c78938cd4615275a8093b7c6"/><dir><dir name="js"><file name="calendar.phtml" hash="0cf736ac3f11475c3b20ce008791ce30"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><file name="ico_reset.png" hash="b5f3195305024564e387bc15ebadcc7c"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="ico_reset.png" hash="b5f3195305024564e387bc15ebadcc7c"/></dir></dir></dir></dir></target></contents>
|
| 21 |
<compatible/>
|
| 22 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
| 23 |
</package>
|
