order_delivery_date - Version 0.1.3

Version Notes

-Bug fixing in review page during checkout process.

Download this release

Release Info

Developer Biztech
Extension order_delivery_date
Version 0.1.3
Comparing to
See all releases


Code changes from version 0.1.2 to 0.1.3

Files changed (5) hide show
  1. app/code/local/Bc/Deliverydate/etc/config.xml +1 -1
  2. app/design/adminhtml/default/default/template/deliverydate/date.phtml +25 -26
  3. app/design/frontend/default/default/template/deliverydate/review/info.phtml +6 -3
  4. package.xml +12 -11
  5. skin/frontend/default/default/images/ico_reset.png +0 -0
app/code/local/Bc/Deliverydate/etc/config.xml CHANGED
@@ -10,7 +10,7 @@
10
  <config>
11
  <modules>
12
  <Bc_Deliverydate>
13
- <version>0.1.2</version>
14
  </Bc_Deliverydate>
15
  </modules>
16
  <frontend>
10
  <config>
11
  <modules>
12
  <Bc_Deliverydate>
13
+ <version>0.1.3</version>
14
  </Bc_Deliverydate>
15
  </modules>
16
  <frontend>
app/design/adminhtml/default/default/template/deliverydate/date.phtml CHANGED
@@ -2,36 +2,35 @@
2
  if (Mage::getStoreConfig('deliverydate/deliverydate_general/enabled')==1){
3
  if (Mage::getStoreConfig('deliverydate/deliverydate_general/on_which_page')==1){
4
  ?>
5
- <div class="field">
6
 
7
- <div class="input-box">
8
- <label for="page_date-end"><?php echo Mage::helper('sales')->__('Delivery Date:') ?></label>
9
- <input name="shipping_arrival_date_display" id="shipping_arrival_date_display" value="" type="text">
10
- <img title="Select date" id="shipping_arrival_date_trig" src="<?php echo Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_SKIN) . 'adminhtml/default/default/images/grid-cal.gif'; ?>" class="v-middle"><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>
11
- </div>
12
 
13
- <label for="shipping_arrival_comments">Delivery Comments:</label><br/>
14
- <textarea cols="65" rows="8" name="shipping_arrival_comments" id="shipping_arrival_comments"></textarea>
15
-
16
-
17
- </div>
18
- <script type="text/javascript">
19
- //<![CDATA[
20
- Calendar.setup({
21
- inputField : 'shipping_arrival_date_display',
22
- ifFormat : '%Y-%m-%e %H:%M:%S',
23
- button : 'shipping_arrival_date_trig',
24
- showsTime : true,
25
- align : 'Bl',
26
- singleClick : true
27
- });
28
-
29
- Event.observe($('link_reset'),'click',function(){
 
 
30
  $('shipping_arrival_date_display').setValue('');
31
  });
32
- //]]>
33
- </script>
34
- <?php
 
 
35
  }
36
  }
37
  ?>
2
  if (Mage::getStoreConfig('deliverydate/deliverydate_general/enabled')==1){
3
  if (Mage::getStoreConfig('deliverydate/deliverydate_general/on_which_page')==1){
4
  ?>
 
5
 
6
+ <div class="field">
 
 
 
 
7
 
8
+ <div class="input-box">
9
+ <label for="page_date-end"><?php echo Mage::helper('sales')->__('Delivery Date:') ?></label>
10
+ <input name="shipping_arrival_date_display" id="shipping_arrival_date_display" value="" type="text">
11
+ <img title="Select date" id="shipping_arrival_date_trig" src="<?php echo Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_SKIN) . 'adminhtml/default/default/images/grid-cal.gif'; ?>" class="v-middle"><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>
12
+ </div>
13
+ <label for="shipping_arrival_comments">Delivery Comments:</label><br/>
14
+ <textarea cols="65" rows="8" name="shipping_arrival_comments" id="shipping_arrival_comments"></textarea>
15
+ </div>
16
+ <script type="text/javascript">
17
+ //<![CDATA[
18
+ Calendar.setup({
19
+ inputField : 'shipping_arrival_date_display',
20
+ ifFormat : '%Y-%m-%e %H:%M:%S',
21
+ button : 'shipping_arrival_date_trig',
22
+ showsTime : true,
23
+ align : 'Bl',
24
+ singleClick : true
25
+ });
26
+ Event.observe($('link_reset'),'click',function(){
27
  $('shipping_arrival_date_display').setValue('');
28
  });
29
+
30
+ //]]>
31
+ </script>
32
+
33
+ <?php
34
  }
35
  }
36
  ?>
app/design/frontend/default/default/template/deliverydate/review/info.phtml CHANGED
@@ -69,8 +69,11 @@
69
  </script>
70
  <div id="checkout-review-submit">
71
  <?php echo $this->getChildHtml('agreements') ?>
72
- <?php
73
- /*
 
 
 
74
  ?>
75
  <div class="buttons-set" id="review-buttons-container">
76
 
@@ -82,7 +85,7 @@
82
  </span>
83
  </div>
84
  <?php
85
- */
86
  ?>
87
  <script type="text/javascript">
88
  //<![CDATA[
69
  </script>
70
  <div id="checkout-review-submit">
71
  <?php echo $this->getChildHtml('agreements') ?>
72
+ <?php
73
+ $get_ver = Mage::getVersion();
74
+ $ver = str_replace('.','',$get_ver);
75
+ if($ver >1411)
76
+ {
77
  ?>
78
  <div class="buttons-set" id="review-buttons-container">
79
 
85
  </span>
86
  </div>
87
  <?php
88
+ }
89
  ?>
90
  <script type="text/javascript">
91
  //<![CDATA[
package.xml CHANGED
@@ -1,22 +1,23 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>order_delivery_date</name>
4
- <version>0.1.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>Delivery date extension will allow customer to choose preferable delivery date for order.</summary>
10
- <description>Delivery date extension will allow customer to choose preferable delivery date for order.
11
-
12
- Extension provide advance configuration for admin to decide where to capture delivery date from user either from shipping method step or review step in checkout process.
13
-
 
14
  Our extension will override files to display delivery date with order information so that admin dont requires to manually change any files.</description>
15
- <notes>-Allow shipping arrival date in admin panel also.</notes>
16
- <authors><author><name>Biztech</name><user>auto-converted</user><email>sales@biztechconsultancy.com</email></author></authors>
17
  <date>2013-04-23</date>
18
- <time>06:37:20</time>
19
- <contents><target name="magedesign"><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"><dir name="js"><file name="calendar.phtml" hash="0cf736ac3f11475c3b20ce008791ce30"/></dir><file name="date.phtml" hash="b4bdd113b3e71e5c499654ce8a55c6f8"/><file name="info.phtml" hash="1a2fe215c78938cd4615275a8093b7c6"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="deliverydate.xml" hash="782935656933efd6e8708824d9275474"/></dir><dir name="template"><dir name="deliverydate"><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="7a499422ec13fdfb114f6a936830785b"/></dir><dir name="shipping_method"><file name="available.phtml" hash="0d7ab3fd3d976cc90ddba322d3c8737e"/></dir><file name="agreements.phtml" hash="77bcb19c1bb923f91a7780520b30e55f"/><file name="deliverydate.phtml" hash="cb61e2e8f65104212bc5a62b2c0634ac"/></dir></dir></dir></dir></dir></target><target name="magelocal"><dir name="Bc"><dir name="Deliverydate"><dir name="Block"><dir name="Adminhtml"><dir name="Deliverydate"><dir name="Edit"><dir name="Tab"><file name="Form.php" hash="eb392c359eafe55fa4af49726e38d25d"/></dir><file name="Form.php" hash="14a5ef75f43be68f966b4233d1a71707"/><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><dir name="Email"><file name="Info.php" hash="77175f966ef7fe9414bfbb1592f651ff"/></dir><dir name="Order"><file name="Info.php" hash="73d4b23927c7531e489eb6a806934b44"/></dir><file name="Deliverydate.php" hash="2e5ea173382e8fd75165b8bee4cfb409"/></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="39826509f51ed636d2057a94c3f2eb49"/><file name="system.xml" hash="adf832b092bdafb35a59d5b71e7601d2"/></dir><dir name="Helper"><file name="Data.php" hash="ec1c739903fa6214802d9574aebedda0"/></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><dir name="Mysql4"><dir name="Deliverydate"><file name="Collection.php" hash="38e5fa717318b2fc9d18eca3db6b0e8b"/></dir><file name="Deliverydate.php" hash="5dee427cc09c3659a76a32a6ec13cade"/></dir><file name="Deliverydate.php" hash="d6d63e0c5db21a706ec7353b307f8a95"/><file name="Observer.php" hash="b0c184174b87e49131e6d672eb18178c"/><file name="Status.php" hash="334c9b7669e215314b32e9cbcff89354"/></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="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="images"><file name="ico_reset.png" hash="b5f3195305024564e387bc15ebadcc7c"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Bc_Deliverydate.xml" hash="eab1058099910cdf137d2e38ee73c392"/></dir></target></contents>
20
  <compatible/>
21
- <dependencies/>
22
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>order_delivery_date</name>
4
+ <version>0.1.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>Delivery date extension will allow customer to choose preferable delivery date for order. &#xD;
10
+ </summary>
11
+ <description>Delivery date extension will allow customer to choose preferable delivery date for order. &#xD;
12
+ &#xD;
13
+ Extension provide advance configuration for admin to decide where to capture delivery date from user either from shipping method step or review step in checkout process. &#xD;
14
+ &#xD;
15
  Our extension will override files to display delivery date with order information so that admin dont requires to manually change any files.</description>
16
+ <notes>-Bug fixing in review page during checkout process.</notes>
17
+ <authors><author><name>Biztech</name><user>biztechcon</user><email>sales@biztechconsultancy.com</email></author></authors>
18
  <date>2013-04-23</date>
19
+ <time>10:29:35</time>
20
+ <contents><target name="mageetc"><dir name="modules"><file name="Bc_Deliverydate.xml" hash="eab1058099910cdf137d2e38ee73c392"/></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="ec1c739903fa6214802d9574aebedda0"/></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="b0c184174b87e49131e6d672eb18178c"/><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="f72293b2a676c8919afed028a3072386"/><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="782935656933efd6e8708824d9275474"/></dir><dir name="template"><dir name="deliverydate"><file name="agreements.phtml" hash="77bcb19c1bb923f91a7780520b30e55f"/><file name="deliverydate.phtml" hash="cb61e2e8f65104212bc5a62b2c0634ac"/><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="45389c6812e93d9b74712a2f4704ac49"/></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="af89d3ddf51d25a4c5c3892e4d6e3f31"/><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="skin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><file name="ico_reset.png" hash=""/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="ico_reset.png" hash=""/></dir></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>
skin/frontend/default/default/images/ico_reset.png DELETED
Binary file