Version Notes
Fixed minor bugs, compatible with Magento CE Version 1.8 & 1.9
Download this release
Release Info
Developer | Prakash Vaniya |
Extension | Phxsolution_Mergeinfo |
Version | 0.1.0 |
Comparing to | |
See all releases |
Version 0.1.0
- app/code/community/Phxsolution/Mergeinfo/Block/Onepage.php +50 -0
- app/code/community/Phxsolution/Mergeinfo/Helper/Data.php +31 -0
- app/code/community/Phxsolution/Mergeinfo/controllers/OnepageController.php +74 -0
- app/code/community/Phxsolution/Mergeinfo/etc/config.xml +84 -0
- app/design/frontend/default/default/layout/mergeinfo.xml +110 -0
- app/design/frontend/default/default/template/mergeinfo/checkout/onepage.phtml +64 -0
- app/design/frontend/default/default/template/mergeinfo/checkout/onepage/progress.phtml +59 -0
- app/design/frontend/default/default/template/mergeinfo/checkout/onepage/progress/billing.phtml +47 -0
- app/design/frontend/default/default/template/mergeinfo/checkout/onepage/progress/payment.phtml +38 -0
- app/design/frontend/default/default/template/mergeinfo/checkout/onepage/progress/shipping.phtml +41 -0
- app/design/frontend/default/default/template/mergeinfo/checkout/onepage/progress/shipping_method.phtml +54 -0
- app/design/frontend/default/default/template/mergeinfo/persistent/checkout/onepage/billing.phtml +391 -0
- app/design/frontend/rwd/default/layout/mergeinfo.xml +110 -0
- app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage.phtml +64 -0
- app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress-bk-1.7.phtml +53 -0
- app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress.phtml +59 -0
- app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress/billing.phtml +47 -0
- app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress/payment.phtml +38 -0
- app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress/shipping.phtml +41 -0
- app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress/shipping_method.phtml +54 -0
- app/design/frontend/rwd/default/template/mergeinfo/persistent/checkout/onepage/billing.phtml +391 -0
- app/etc/modules/Phxsolution_Mergeinfo.xml +35 -0
- app/locale/en_US/Phxsolution_Mergeinfo.csv +2 -0
- package.xml +20 -0
- skin/frontend/default/default/js/mergeinfocheckout.js +7 -0
- skin/frontend/rwd/default/js/mergeinfocheckout.js +7 -0
app/code/community/Phxsolution/Mergeinfo/Block/Onepage.php
ADDED
@@ -0,0 +1,50 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* PHXSolution Mergeinfo
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
14 |
+
*
|
15 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
16 |
+
*
|
17 |
+
* @category Phxsolution_Mergeinfo_Block_Onepage
|
18 |
+
* @package Phxsolution_Mergeinfo
|
19 |
+
* @author Prakash Vaniya
|
20 |
+
* @contact contact@phxsolution.com
|
21 |
+
* @site www.phxsolution.com
|
22 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
23 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
24 |
+
*/
|
25 |
+
?>
|
26 |
+
|
27 |
+
<?php
|
28 |
+
class Phxsolution_Mergeinfo_Block_Onepage extends Mage_Checkout_Block_Onepage
|
29 |
+
{
|
30 |
+
public function getSteps()
|
31 |
+
{
|
32 |
+
$steps = array();
|
33 |
+
|
34 |
+
if (!$this->isCustomerLoggedIn()) {
|
35 |
+
$steps['login'] = $this->getCheckout()->getStepData('login');
|
36 |
+
}
|
37 |
+
|
38 |
+
$stepCodes = array('billing', 'shipping_method', 'payment', 'review');
|
39 |
+
|
40 |
+
foreach ($stepCodes as $step) {
|
41 |
+
$steps[$step] = $this->getCheckout()->getStepData($step);
|
42 |
+
}
|
43 |
+
return $steps;
|
44 |
+
}
|
45 |
+
|
46 |
+
public function getActiveStep()
|
47 |
+
{
|
48 |
+
return $this->isCustomerLoggedIn() ? 'billing' : 'login';
|
49 |
+
}
|
50 |
+
}
|
app/code/community/Phxsolution/Mergeinfo/Helper/Data.php
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* PHXSolution Mergeinfo
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
14 |
+
*
|
15 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
16 |
+
*
|
17 |
+
* @category Phxsolution_Mergeinfo_Helper
|
18 |
+
* @package Phxsolution_Mergeinfo
|
19 |
+
* @author Prakash Vaniya
|
20 |
+
* @contact contact@phxsolution.com
|
21 |
+
* @site www.phxsolution.com
|
22 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
23 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
24 |
+
*/
|
25 |
+
?>
|
26 |
+
|
27 |
+
<?php
|
28 |
+
class Phxsolution_Mergeinfo_Helper_Data extends Mage_Core_Helper_Abstract
|
29 |
+
{
|
30 |
+
|
31 |
+
}
|
app/code/community/Phxsolution/Mergeinfo/controllers/OnepageController.php
ADDED
@@ -0,0 +1,74 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* PHXSolution Mergeinfo
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
14 |
+
*
|
15 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
16 |
+
*
|
17 |
+
* @category Phxsolution_Mergeinfo_OnepageController
|
18 |
+
* @package Phxsolution_Mergeinfo
|
19 |
+
* @author Prakash Vaniya
|
20 |
+
* @contact contact@phxsolution.com
|
21 |
+
* @site www.phxsolution.com
|
22 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
23 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
24 |
+
*/
|
25 |
+
?>
|
26 |
+
|
27 |
+
<?php
|
28 |
+
require_once 'Mage/Checkout/controllers/OnepageController.php';
|
29 |
+
class Phxsolution_Mergeinfo_OnepageController extends Mage_Checkout_OnepageController
|
30 |
+
{
|
31 |
+
public function saveBillingAction()
|
32 |
+
{
|
33 |
+
if ($this->_expireAjax()) {
|
34 |
+
return;
|
35 |
+
}
|
36 |
+
if ($this->getRequest()->isPost()) {
|
37 |
+
|
38 |
+
$billingData = $this->getRequest()->getPost('billing', array());
|
39 |
+
$customerBillingAddressId = $this->getRequest()->getPost('billing_address_id', false);
|
40 |
+
|
41 |
+
if (isset($billingData['email'])) {
|
42 |
+
$billingData['email'] = trim($billingData['email']);
|
43 |
+
}
|
44 |
+
$result = $this->getOnepage()->saveBilling($billingData, $customerBillingAddressId);
|
45 |
+
|
46 |
+
if (!isset($result['error'])) {
|
47 |
+
|
48 |
+
$shippingData = $this->getRequest()->getPost('shipping', array());
|
49 |
+
$customerShippingAddressId = $this->getRequest()->getPost('shipping_address_id', false);
|
50 |
+
$result = $this->getOnepage()->saveShipping($shippingData, $customerShippingAddressId);
|
51 |
+
|
52 |
+
if (!isset($result['error'])) {
|
53 |
+
if ($this->getOnepage()->getQuote()->isVirtual()) {
|
54 |
+
$result['goto_section'] = 'payment';
|
55 |
+
$result['update_section'] = array(
|
56 |
+
'name' => 'payment-method',
|
57 |
+
'html' => $this->_getPaymentMethodsHtml()
|
58 |
+
);
|
59 |
+
} else {
|
60 |
+
$result['goto_section'] = 'shipping_method';
|
61 |
+
$result['update_section'] = array(
|
62 |
+
'name' => 'shipping-method',
|
63 |
+
'html' => $this->_getShippingMethodsHtml()
|
64 |
+
);
|
65 |
+
|
66 |
+
$result['allow_sections'] = array('shipping_method');
|
67 |
+
//$result['duplicateBillingInfo'] = 'false';
|
68 |
+
}
|
69 |
+
}
|
70 |
+
}
|
71 |
+
$this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
|
72 |
+
}
|
73 |
+
}
|
74 |
+
}
|
app/code/community/Phxsolution/Mergeinfo/etc/config.xml
ADDED
@@ -0,0 +1,84 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* PHXSolution Mergeinfo
|
5 |
+
*
|
6 |
+
* NOTICE OF LICENSE
|
7 |
+
*
|
8 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
9 |
+
* that is bundled with this package in the file LICENSE.txt.
|
10 |
+
* It is also available through the world-wide-web at this URL:
|
11 |
+
* http://opensource.org/licenses/osl-3.0.php
|
12 |
+
* If you did not receive a copy of the license and are unable to
|
13 |
+
* obtain it through the world-wide-web, please send an email
|
14 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
15 |
+
*
|
16 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
17 |
+
*
|
18 |
+
* @category module configuration
|
19 |
+
* @package Phxsolution_Mergeinfo
|
20 |
+
* @author Prakash Vaniya
|
21 |
+
* @contact contact@phxsolution.com
|
22 |
+
* @site www.phxsolution.com
|
23 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
-->
|
27 |
+
|
28 |
+
<config>
|
29 |
+
<modules>
|
30 |
+
<Phxsolution_Mergeinfo>
|
31 |
+
<version>0.1.0</version>
|
32 |
+
</Phxsolution_Mergeinfo>
|
33 |
+
</modules>
|
34 |
+
<frontend>
|
35 |
+
<routers>
|
36 |
+
<mergeinfo>
|
37 |
+
<use>standard</use>
|
38 |
+
<args>
|
39 |
+
<module>Phxsolution_Mergeinfo</module>
|
40 |
+
<frontName>mergeinfo</frontName>
|
41 |
+
</args>
|
42 |
+
</mergeinfo>
|
43 |
+
</routers>
|
44 |
+
<translate>
|
45 |
+
<modules>
|
46 |
+
<Mage_Checkout>
|
47 |
+
<files>
|
48 |
+
<default>Phxsolution_Mergeinfo.csv</default>
|
49 |
+
</files>
|
50 |
+
</Mage_Checkout>
|
51 |
+
</modules>
|
52 |
+
</translate>
|
53 |
+
<layout>
|
54 |
+
<updates>
|
55 |
+
<mergeinfo>
|
56 |
+
<file>mergeinfo.xml</file>
|
57 |
+
</mergeinfo>
|
58 |
+
</updates>
|
59 |
+
</layout>
|
60 |
+
</frontend>
|
61 |
+
<global>
|
62 |
+
<rewrite>
|
63 |
+
<Phxsolution_checkout> <!--This can be any unique id -->
|
64 |
+
<from><![CDATA[#^/checkout/onepage/#]]></from> <!-- the URL which u want to override-->
|
65 |
+
<to>/mergeinfo/onepage/</to> <!-- destination url -->
|
66 |
+
</Phxsolution_checkout>
|
67 |
+
</rewrite>
|
68 |
+
<blocks>
|
69 |
+
<checkout>
|
70 |
+
<rewrite>
|
71 |
+
<onepage>Phxsolution_Mergeinfo_Block_Onepage</onepage>
|
72 |
+
</rewrite>
|
73 |
+
</checkout>
|
74 |
+
<mergeinfo>
|
75 |
+
<class>Phxsolution_Mergeinfo_Block</class>
|
76 |
+
</mergeinfo>
|
77 |
+
</blocks>
|
78 |
+
<helpers>
|
79 |
+
<mergeinfo>
|
80 |
+
<class>Phxsolution_Mergeinfo_Helper</class>
|
81 |
+
</mergeinfo>
|
82 |
+
</helpers>
|
83 |
+
</global>
|
84 |
+
</config>
|
app/design/frontend/default/default/layout/mergeinfo.xml
ADDED
@@ -0,0 +1,110 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* PHXSolution Mergeinfo
|
5 |
+
*
|
6 |
+
* NOTICE OF LICENSE
|
7 |
+
*
|
8 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
9 |
+
* that is bundled with this package in the file LICENSE.txt.
|
10 |
+
* It is also available through the world-wide-web at this URL:
|
11 |
+
* http://opensource.org/licenses/osl-3.0.php
|
12 |
+
* If you did not receive a copy of the license and are unable to
|
13 |
+
* obtain it through the world-wide-web, please send an email
|
14 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
15 |
+
*
|
16 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
17 |
+
*
|
18 |
+
* @category design
|
19 |
+
* @package Phxsolution_Mergeinfo
|
20 |
+
* @author Prakash Vaniya
|
21 |
+
* @contact contact@phxsolution.com
|
22 |
+
* @site www.phxsolution.com
|
23 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
-->
|
27 |
+
|
28 |
+
<layout version="0.1.0">
|
29 |
+
<checkout_onepage_index> <!-- Adding our new step to onepage block -->
|
30 |
+
<reference name="right">
|
31 |
+
<action method="unsetChildren"></action>
|
32 |
+
<block type="page/html_wrapper" name="checkout.progress.wrapper" translate="label">
|
33 |
+
<label>Checkout Progress Wrapper</label>
|
34 |
+
<action method="setElementId"><value>checkout-progress-wrapper</value></action>
|
35 |
+
<block type="checkout/onepage_progress" name="checkout.progress" before="-" template="mergeinfo/checkout/onepage/progress.phtml">
|
36 |
+
<block type="checkout/onepage_progress" name="billing.progress" template="mergeinfo/checkout/onepage/progress/billing.phtml"></block>
|
37 |
+
<block type="checkout/onepage_progress" name="shipping.progress" template="mergeinfo/checkout/onepage/progress/shipping.phtml"></block>
|
38 |
+
<block type="checkout/onepage_progress" name="shippingmethod.progress" template="mergeinfo/checkout/onepage/progress/shipping_method.phtml"></block>
|
39 |
+
<block type="checkout/onepage_progress" name="payment.progress" template="mergeinfo/checkout/onepage/progress/payment.phtml"></block>
|
40 |
+
</block>
|
41 |
+
</block>
|
42 |
+
</reference>
|
43 |
+
<reference name='checkout.onepage'>
|
44 |
+
<action method='setTemplate'><template>mergeinfo/checkout/onepage.phtml</template></action>
|
45 |
+
</reference>
|
46 |
+
<reference name="checkout.onepage.billing"> <!-- Change the template of billing block -->
|
47 |
+
<action method="setTemplate"><template>mergeinfo/persistent/checkout/onepage/billing.phtml</template></action>
|
48 |
+
</reference>
|
49 |
+
<reference name='checkout.progress'> <!-- Change the template of progress block -->
|
50 |
+
<action method='setTemplate'><template>mergeinfo/checkout/onepage/progress.phtml</template></action>
|
51 |
+
</reference>
|
52 |
+
</checkout_onepage_index>
|
53 |
+
<checkout_onepage_progress> <!-- Change the template of progress block -->
|
54 |
+
<block type="checkout/onepage_progress" name="root" output="toHtml" template="mergeinfo/checkout/onepage/progress.phtml">
|
55 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
56 |
+
<block type="checkout/onepage_progress" name="billing.progress" template="mergeinfo/checkout/onepage/progress/billing.phtml"></block>
|
57 |
+
<block type="checkout/onepage_progress" name="shipping.progress" template="mergeinfo/checkout/onepage/progress/shipping.phtml"></block>
|
58 |
+
<block type="checkout/onepage_progress" name="shippingmethod.progress" template="mergeinfo/checkout/onepage/progress/shipping_method.phtml"></block>
|
59 |
+
<block type="checkout/onepage_progress" name="payment.progress" template="mergeinfo/checkout/onepage/progress/payment.phtml"></block>
|
60 |
+
</block>
|
61 |
+
<reference name='root'>
|
62 |
+
<action method='setTemplate'><template>mergeinfo/checkout/onepage/progress.phtml</template></action>
|
63 |
+
</reference>
|
64 |
+
</checkout_onepage_progress>
|
65 |
+
|
66 |
+
<!-- One page checkout progress block -->
|
67 |
+
<checkout_onepage_progress_billing>
|
68 |
+
<!-- Mage_Checkout -->
|
69 |
+
<remove name="right"/>
|
70 |
+
<remove name="left"/>
|
71 |
+
|
72 |
+
<block type="checkout/onepage_progress" name="root" output="toHtml" template="mergeinfo/checkout/onepage/progress/billing.phtml">
|
73 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
74 |
+
</block>
|
75 |
+
</checkout_onepage_progress_billing>
|
76 |
+
|
77 |
+
<checkout_onepage_progress_shipping>
|
78 |
+
<!-- Mage_Checkout -->
|
79 |
+
<remove name="right"/>
|
80 |
+
<remove name="left"/>
|
81 |
+
|
82 |
+
<block type="checkout/onepage_progress" name="root" output="toHtml" template="mergeinfo/checkout/onepage/progress/shipping.phtml">
|
83 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
84 |
+
</block>
|
85 |
+
</checkout_onepage_progress_shipping>
|
86 |
+
|
87 |
+
|
88 |
+
<checkout_onepage_progress_shipping_method>
|
89 |
+
<!-- Mage_Checkout -->
|
90 |
+
<remove name="right"/>
|
91 |
+
<remove name="left"/>
|
92 |
+
|
93 |
+
<block type="checkout/onepage_progress" name="root" output="toHtml" template="mergeinfo/checkout/onepage/progress/shipping_method.phtml">
|
94 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
95 |
+
</block>
|
96 |
+
</checkout_onepage_progress_shipping_method>
|
97 |
+
|
98 |
+
<checkout_onepage_progress_payment>
|
99 |
+
<!-- Mage_Checkout -->
|
100 |
+
<remove name="right"/>
|
101 |
+
<remove name="left"/>
|
102 |
+
|
103 |
+
<block type="checkout/onepage_progress" name="root" output="toHtml" template="mergeinfo/checkout/onepage/progress/payment.phtml">
|
104 |
+
<block type="checkout/onepage_payment_info" name="payment_info">
|
105 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
106 |
+
</block>
|
107 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
108 |
+
</block>
|
109 |
+
</checkout_onepage_progress_payment>
|
110 |
+
</layout>
|
app/design/frontend/default/default/template/mergeinfo/checkout/onepage.phtml
ADDED
@@ -0,0 +1,64 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* PHXSolution Mergeinfo
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
14 |
+
*
|
15 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
16 |
+
*
|
17 |
+
* @category design
|
18 |
+
* @package Phxsolution_Mergeinfo
|
19 |
+
* @author Prakash Vaniya
|
20 |
+
* @contact contact@phxsolution.com
|
21 |
+
* @site www.phxsolution.com
|
22 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
23 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
24 |
+
*/
|
25 |
+
?>
|
26 |
+
|
27 |
+
<div class="page-title">
|
28 |
+
<h1><?php echo $this->__('Checkout') ?></h1>
|
29 |
+
</div>
|
30 |
+
<script type="text/javascript" src="<?php echo $this->getJsUrl('varien/accordion.js') ?>"></script>
|
31 |
+
<script type="text/javascript" src="<?php echo $this->getSkinUrl('js/opcheckout.js') ?>"></script>
|
32 |
+
<!-- New Code Added Below -->
|
33 |
+
<script type="text/javascript" src="<?php echo $this->getSkinUrl('js/mergeinfocheckout.js') ?>"></script>
|
34 |
+
<script type="text/javascript">countryRegions = <?php echo $this->helper('directory')->getRegionJson() ?></script>
|
35 |
+
<ol class="opc" id="checkoutSteps">
|
36 |
+
<?php $i=0; foreach($this->getSteps() as $_stepId => $_stepInfo): ?>
|
37 |
+
<?php if (!$this->getChild($_stepId) || !$this->getChild($_stepId)->isShow()): continue; endif; $i++ ?>
|
38 |
+
<li id="opc-<?php echo $_stepId ?>" class="section<?php echo !empty($_stepInfo['allow'])?' allow':'' ?><?php echo !empty($_stepInfo['complete'])?' saved':'' ?>">
|
39 |
+
<div class="step-title">
|
40 |
+
<span class="number"><?php echo $i ?></span>
|
41 |
+
<h2><?php echo $_stepInfo['label'] ?></h2>
|
42 |
+
<a href="#"><?php echo $this->__('Edit') ?></a>
|
43 |
+
</div>
|
44 |
+
<div id="checkout-step-<?php echo $_stepId ?>" class="step a-item" style="display:none;">
|
45 |
+
<?php echo $this->getChildHtml($_stepId) ?>
|
46 |
+
</div>
|
47 |
+
</li>
|
48 |
+
<?php endforeach ?>
|
49 |
+
</ol>
|
50 |
+
<script type="text/javascript">
|
51 |
+
//<![CDATA[
|
52 |
+
var accordion = new Accordion('checkoutSteps', '.step-title', true);
|
53 |
+
<?php if($this->getActiveStep()): ?>
|
54 |
+
accordion.openSection('opc-<?php echo $this->getActiveStep() ?>');
|
55 |
+
<?php endif ?>
|
56 |
+
//New Code Added Below
|
57 |
+
var checkout = new Phxsolution(accordion,{
|
58 |
+
progress: '<?php echo $this->getUrl('checkout/onepage/progress') ?>',
|
59 |
+
review: '<?php echo $this->getUrl('checkout/onepage/review') ?>',
|
60 |
+
saveMethod: '<?php echo $this->getUrl('checkout/onepage/saveMethod') ?>',
|
61 |
+
failure: '<?php echo $this->getUrl('checkout/cart') ?>'}
|
62 |
+
);
|
63 |
+
//]]>
|
64 |
+
</script>
|
app/design/frontend/default/default/template/mergeinfo/checkout/onepage/progress.phtml
ADDED
@@ -0,0 +1,59 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<div class="block block-progress opc-block-progress">
|
28 |
+
<div class="block-title">
|
29 |
+
<strong><span><?php echo $this->__('Your Checkout Progress') ?></span></strong>
|
30 |
+
</div>
|
31 |
+
<div class="block-content">
|
32 |
+
<dl>
|
33 |
+
<?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
|
34 |
+
<div id="billing-progress-opcheckout">
|
35 |
+
<?php echo $this->getChildHtml('billing.progress') ?>
|
36 |
+
</div>
|
37 |
+
<?php endif; ?>
|
38 |
+
|
39 |
+
<?php /* if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
|
40 |
+
<div id="shipping-progress-opcheckout">
|
41 |
+
<?php echo $this->getChildHtml('shipping.progress') ?>
|
42 |
+
</div>
|
43 |
+
<?php endif; */ ?>
|
44 |
+
|
45 |
+
<?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
|
46 |
+
<div id="shipping_method-progress-opcheckout">
|
47 |
+
<?php echo $this->getChildHtml('shippingmethod.progress') ?>
|
48 |
+
</div>
|
49 |
+
<?php endif; ?>
|
50 |
+
|
51 |
+
<?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
|
52 |
+
<div id="payment-progress-opcheckout">
|
53 |
+
<?php echo $this->getChildHtml('payment.progress') ?>
|
54 |
+
</div>
|
55 |
+
<?php endif; ?>
|
56 |
+
</dl>
|
57 |
+
</div>
|
58 |
+
</div>
|
59 |
+
|
app/design/frontend/default/default/template/mergeinfo/checkout/onepage/progress/billing.phtml
ADDED
@@ -0,0 +1,47 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<?php if ($this->getCheckout()->getStepData('billing', 'complete')): ?>
|
28 |
+
<dt class="complete">
|
29 |
+
<a href="#billing" onclick="checkout.changeSection('opc-billing'); return false;"><strong><?php echo $this->__('Billing Address') ?></strong></a>
|
30 |
+
</dt>
|
31 |
+
<dd class="complete">
|
32 |
+
<address><?php echo $this->getBilling()->format('html') ?></address>
|
33 |
+
</dd>
|
34 |
+
<dt class="complete">
|
35 |
+
<a href="#billing" onclick="checkout.changeSection('opc-billing'); return false;"><strong><?php echo $this->__('Shipping Address') ?></strong></a>
|
36 |
+
</dt>
|
37 |
+
<dd class="complete">
|
38 |
+
<address><?php echo $this->getShipping()->format('html') ?></address>
|
39 |
+
</dd>
|
40 |
+
<?php else: ?>
|
41 |
+
<dt>
|
42 |
+
<?php echo $this->__('Billing Address') ?>
|
43 |
+
</dt>
|
44 |
+
<dt>
|
45 |
+
<?php echo $this->__('Shipping Address') ?>
|
46 |
+
</dt>
|
47 |
+
<?php endif; ?>
|
app/design/frontend/default/default/template/mergeinfo/checkout/onepage/progress/payment.phtml
ADDED
@@ -0,0 +1,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<?php if ($this->getCheckout()->getStepData('payment', 'complete')): ?>
|
28 |
+
<dt class="complete">
|
29 |
+
<a href="#payment" onclick="checkout.changeSection('opc-payment'); return false;"><strong><?php echo $this->__('Payment Method') ?></strong></a>
|
30 |
+
</dt>
|
31 |
+
<dd class="complete">
|
32 |
+
<?php echo $this->getPaymentHtml() ?>
|
33 |
+
</dd>
|
34 |
+
<?php else: ?>
|
35 |
+
<dt>
|
36 |
+
<?php echo $this->__('Payment Method') ?>
|
37 |
+
</dt>
|
38 |
+
<?php endif; ?>
|
app/design/frontend/default/default/template/mergeinfo/checkout/onepage/progress/shipping.phtml
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<?php if ($this->getCheckout()->getStepData('shipping', 'complete')): ?>
|
28 |
+
<?php $completeClass = $this->getCheckout()->getStepData('shipping', 'complete') ? 'complete' : ''; ?>
|
29 |
+
<dt class="<?php echo $completeClass ?>">
|
30 |
+
<a href="#shipping" onclick="checkout.changeSection('opc-shipping');return false;"><strong><?php echo $this->__('Shipping Address') ?></strong></a>
|
31 |
+
</dt>
|
32 |
+
<dd class="<?php echo $completeClass ?>">
|
33 |
+
<?php if ($this->getCheckout()->getStepData('shipping', 'complete')): ?>
|
34 |
+
<address><?php echo $this->getShipping()->format('html') ?></address>
|
35 |
+
<?php endif; ?>
|
36 |
+
</dd>
|
37 |
+
<?php else: ?>
|
38 |
+
<dt>
|
39 |
+
<?php echo $this->__('Shipping Address') ?>
|
40 |
+
</dt>
|
41 |
+
<?php endif; ?>
|
app/design/frontend/default/default/template/mergeinfo/checkout/onepage/progress/shipping_method.phtml
ADDED
@@ -0,0 +1,54 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<?php if ($this->getCheckout()->getStepData('shipping_method', 'complete')): ?>
|
28 |
+
<dt class="complete">
|
29 |
+
<a href="#shipping_method" onclick="checkout.changeSection('opc-shipping_method'); return false;"><strong><?php echo $this->__('Shipping Method') ?></strong></a>
|
30 |
+
</dt>
|
31 |
+
<dd class="complete">
|
32 |
+
<?php if ($this->getShippingMethod()): ?>
|
33 |
+
<?php echo $this->getShippingDescription() ?>
|
34 |
+
|
35 |
+
<?php $_excl = $this->getShippingPriceExclTax(); ?>
|
36 |
+
<?php $_incl = $this->getShippingPriceInclTax(); ?>
|
37 |
+
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
38 |
+
<?php echo $_incl; ?>
|
39 |
+
<?php else: ?>
|
40 |
+
<?php echo $_excl; ?>
|
41 |
+
<?php endif; ?>
|
42 |
+
<?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
|
43 |
+
(<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
|
44 |
+
<?php endif; ?>
|
45 |
+
|
46 |
+
<?php else: ?>
|
47 |
+
<?php echo $this->__('Shipping method has not been selected yet') ?>
|
48 |
+
<?php endif; ?>
|
49 |
+
</dd>
|
50 |
+
<?php else: ?>
|
51 |
+
<dt>
|
52 |
+
<?php echo $this->__('Shipping Method') ?>
|
53 |
+
</dt>
|
54 |
+
<?php endif; ?>
|
app/design/frontend/default/default/template/mergeinfo/persistent/checkout/onepage/billing.phtml
ADDED
@@ -0,0 +1,391 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* PHXSolution Mergeinfo
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
14 |
+
*
|
15 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
16 |
+
*
|
17 |
+
* @category design
|
18 |
+
* @package Phxsolution_Mergeinfo
|
19 |
+
* @author Prakash Vaniya
|
20 |
+
* @contact contact@phxsolution.com
|
21 |
+
* @site www.phxsolution.com
|
22 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
23 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
24 |
+
*/
|
25 |
+
?>
|
26 |
+
|
27 |
+
<style type="text/css">
|
28 |
+
.form-list .fields {
|
29 |
+
margin-bottom: 10px;
|
30 |
+
}
|
31 |
+
.form-list .field {
|
32 |
+
margin-bottom: 10px;
|
33 |
+
}
|
34 |
+
.form-list li.wide .input-box {
|
35 |
+
width: 315px;
|
36 |
+
}
|
37 |
+
.form-list li.wide select {
|
38 |
+
width: 315px;
|
39 |
+
}
|
40 |
+
</style>
|
41 |
+
<form id="co-billing-form" action="">
|
42 |
+
<div class="col2-set">
|
43 |
+
<div class="col-1">
|
44 |
+
<h3><?php echo $this->__('Billing Info')?></h3>
|
45 |
+
<fieldset>
|
46 |
+
<ul class="form-list">
|
47 |
+
<?php if ($this->customerHasAddresses()): ?>
|
48 |
+
<li class="wide">
|
49 |
+
<label for="billing-address-select"><?php echo $this->__('Select a billing address from your address book or enter a new address.') ?></label>
|
50 |
+
<div class="input-box">
|
51 |
+
<?php echo $this->getAddressesHtmlSelect('billing') ?>
|
52 |
+
</div>
|
53 |
+
</li>
|
54 |
+
<?php endif; ?>
|
55 |
+
<li id="billing-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif; ?>>
|
56 |
+
<fieldset>
|
57 |
+
<input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
|
58 |
+
<ul>
|
59 |
+
<li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
|
60 |
+
<li class="fields">
|
61 |
+
<div class="field">
|
62 |
+
<label for="billing:company"><?php echo $this->__('Company') ?></label>
|
63 |
+
<div class="input-box">
|
64 |
+
<input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
|
65 |
+
</div>
|
66 |
+
</div>
|
67 |
+
<?php if(!$this->isCustomerLoggedIn()): ?>
|
68 |
+
<div class="field">
|
69 |
+
<label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
|
70 |
+
<div class="input-box">
|
71 |
+
<input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
|
72 |
+
</div>
|
73 |
+
</div>
|
74 |
+
<?php endif; ?>
|
75 |
+
</li>
|
76 |
+
<?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
|
77 |
+
<li class="fields">
|
78 |
+
<label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
|
79 |
+
<div class="input-box">
|
80 |
+
<input type="text" title="<?php echo $this->__('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
|
81 |
+
</div>
|
82 |
+
</li>
|
83 |
+
<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
|
84 |
+
<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
|
85 |
+
<li class="fields">
|
86 |
+
<div class="input-box">
|
87 |
+
<input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
|
88 |
+
</div>
|
89 |
+
</li>
|
90 |
+
<?php endfor; ?>
|
91 |
+
<?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
|
92 |
+
<li class="fields">
|
93 |
+
<label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
|
94 |
+
<div class="input-box">
|
95 |
+
<input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
|
96 |
+
</div>
|
97 |
+
</li>
|
98 |
+
<?php endif; ?>
|
99 |
+
<li class="fields">
|
100 |
+
<div class="field">
|
101 |
+
<label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
|
102 |
+
<div class="input-box">
|
103 |
+
<input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
|
104 |
+
</div>
|
105 |
+
</div>
|
106 |
+
<div class="field">
|
107 |
+
<label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
|
108 |
+
<div class="input-box">
|
109 |
+
<input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
|
110 |
+
</div>
|
111 |
+
</div>
|
112 |
+
</li>
|
113 |
+
<li class="fields">
|
114 |
+
<div class="field">
|
115 |
+
<label for="billing:country_id" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
|
116 |
+
<div class="input-box">
|
117 |
+
<?php echo $this->getCountryHtmlSelect('billing') ?>
|
118 |
+
</div>
|
119 |
+
</div>
|
120 |
+
<div class="field">
|
121 |
+
<label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
|
122 |
+
<div class="input-box">
|
123 |
+
<select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
|
124 |
+
<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
|
125 |
+
</select>
|
126 |
+
<script type="text/javascript">
|
127 |
+
//<![CDATA[
|
128 |
+
$('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
|
129 |
+
//]]>
|
130 |
+
</script>
|
131 |
+
<input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
|
132 |
+
</div>
|
133 |
+
</div>
|
134 |
+
</li>
|
135 |
+
<li class="fields">
|
136 |
+
<div class="field">
|
137 |
+
<label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
|
138 |
+
<div class="input-box">
|
139 |
+
<input type="text" name="billing[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
|
140 |
+
</div>
|
141 |
+
</div>
|
142 |
+
<div class="field">
|
143 |
+
<label for="billing:fax"><?php echo $this->__('Fax') ?></label>
|
144 |
+
<div class="input-box">
|
145 |
+
<input type="text" name="billing[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="billing:fax" />
|
146 |
+
</div>
|
147 |
+
</div>
|
148 |
+
</li>
|
149 |
+
<?php if(!$this->isCustomerLoggedIn()): ?>
|
150 |
+
|
151 |
+
<?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
|
152 |
+
<?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
|
153 |
+
<?php if ($_dob->isEnabled() || $_gender->isEnabled()): ?>
|
154 |
+
<li class="fields">
|
155 |
+
<?php if ($_dob->isEnabled()): ?>
|
156 |
+
<div class="field">
|
157 |
+
<?php echo $_dob->setDate($this->getQuote()->getCustomerDob())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
|
158 |
+
</div>
|
159 |
+
<?php endif; ?>
|
160 |
+
<?php if ($_gender->isEnabled()): ?>
|
161 |
+
<div class="field">
|
162 |
+
<?php echo $_gender->setGender($this->getQuote()->getCustomerGender())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
|
163 |
+
</div>
|
164 |
+
<?php endif ?>
|
165 |
+
</li>
|
166 |
+
<?php endif ?>
|
167 |
+
|
168 |
+
<?php if ($this->isTaxvatEnabled()):?>
|
169 |
+
<li><?php echo $this->getTaxvatHtml() ?></li>
|
170 |
+
<?php endif; ?>
|
171 |
+
|
172 |
+
<li class="fields" id="register-customer-password">
|
173 |
+
<div class="field">
|
174 |
+
<label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
175 |
+
<div class="input-box">
|
176 |
+
<input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
|
177 |
+
</div>
|
178 |
+
</div>
|
179 |
+
<div class="field">
|
180 |
+
<label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
|
181 |
+
<div class="input-box">
|
182 |
+
<input type="password" name="billing[confirm_password]" title="<?php echo $this->__('Confirm Password') ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
|
183 |
+
</div>
|
184 |
+
</div>
|
185 |
+
</li>
|
186 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
187 |
+
<?php endif; ?>
|
188 |
+
<?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
|
189 |
+
<li class="control">
|
190 |
+
<input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="billing:save_in_address_book" onchange="if(window.shipping) shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label>
|
191 |
+
</li>
|
192 |
+
<?php else:?>
|
193 |
+
<li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
|
194 |
+
<?php endif; ?>
|
195 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
196 |
+
</ul>
|
197 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
198 |
+
</fieldset>
|
199 |
+
</li>
|
200 |
+
<?php /* if ($this->canShip()): ?>
|
201 |
+
<li class="control">
|
202 |
+
<input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1" checked="checked" title="<?php echo $this->__('Ship to this address') ?>" onclick="$('shipping:same_as_billing').checked = true;" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo $this->__('Ship to this address') ?></label></li>
|
203 |
+
<li class="control">
|
204 |
+
<input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0" title="<?php echo $this->__('Ship to different address') ?>" onclick="$('shipping:same_as_billing').checked = false;" class="radio" /><label for="billing:use_for_shipping_no"><?php echo $this->__('Ship to different address') ?></label>
|
205 |
+
</li>
|
206 |
+
<?php endif; */ ?>
|
207 |
+
</ul>
|
208 |
+
<?php if (!$this->canShip()): ?>
|
209 |
+
<input type="hidden" name="billing[use_for_shipping]" value="1" />
|
210 |
+
<?php endif; ?>
|
211 |
+
</fieldset>
|
212 |
+
</div>
|
213 |
+
<div class="col-2">
|
214 |
+
<h3><?php echo $this->__('Shipping Information')?></h3>
|
215 |
+
<fieldset>
|
216 |
+
<ul class="form-list">
|
217 |
+
<?php if ($this->customerHasAddresses()): ?>
|
218 |
+
<li class="wide">
|
219 |
+
<label for="shipping-address-select"><?php echo $this->__('Select a shipping address from your address book or enter a new address.') ?></label>
|
220 |
+
<div class="input-box">
|
221 |
+
<?php echo $this->getAddressesHtmlSelect('shipping') ?>
|
222 |
+
</div>
|
223 |
+
</li>
|
224 |
+
<?php endif ?>
|
225 |
+
<li id="shipping-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif ?>>
|
226 |
+
<fieldset>
|
227 |
+
<input type="hidden" name="shipping[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="shipping:address_id" />
|
228 |
+
<ul>
|
229 |
+
<li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress())->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->setFieldParams('onchange="shipping.setSameAsBilling(false)"')->toHtml() ?></li>
|
230 |
+
<li class="fields">
|
231 |
+
<div class="fields">
|
232 |
+
<label for="shipping:company"><?php echo $this->__('Company') ?></label>
|
233 |
+
<div class="input-box">
|
234 |
+
<input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" onchange="shipping.setSameAsBilling(false);" />
|
235 |
+
</div>
|
236 |
+
</div>
|
237 |
+
</li>
|
238 |
+
<?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
|
239 |
+
<li class="fields">
|
240 |
+
<label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
|
241 |
+
<div class="input-box">
|
242 |
+
<input type="text" title="<?php echo $this->__('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
|
243 |
+
</div>
|
244 |
+
</li>
|
245 |
+
<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
|
246 |
+
<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
|
247 |
+
<li class="fields">
|
248 |
+
<div class="input-box">
|
249 |
+
<input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
|
250 |
+
</div>
|
251 |
+
</li>
|
252 |
+
<?php endfor; ?>
|
253 |
+
<?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
|
254 |
+
<li class="fields">
|
255 |
+
<label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
|
256 |
+
<div class="input-box">
|
257 |
+
<input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()); ?>" title="<?php echo $this->__('VAT Number'); ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
|
258 |
+
</div>
|
259 |
+
</li>
|
260 |
+
<?php endif; ?>
|
261 |
+
<li class="fields">
|
262 |
+
<div class="field">
|
263 |
+
<label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
|
264 |
+
<div class="input-box">
|
265 |
+
<input type="text" title="<?php echo $this->__('City') ?>" name="shipping[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="shipping:city" onchange="shipping.setSameAsBilling(false);" />
|
266 |
+
</div>
|
267 |
+
</div>
|
268 |
+
<div class="field">
|
269 |
+
<label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
|
270 |
+
<div class="input-box">
|
271 |
+
<input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" onchange="shipping.setSameAsBilling(false);" />
|
272 |
+
</div>
|
273 |
+
</div>
|
274 |
+
</li>
|
275 |
+
<li class="fields">
|
276 |
+
<div class="field">
|
277 |
+
<label for="shipping:country_id" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
|
278 |
+
<div class="input-box">
|
279 |
+
<?php echo $this->getCountryHtmlSelect('shipping') ?>
|
280 |
+
</div>
|
281 |
+
</div>
|
282 |
+
<div class="field">
|
283 |
+
<label for="shipping:region" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
|
284 |
+
<div class="input-box">
|
285 |
+
<select id="shipping:region_id" name="shipping[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
|
286 |
+
<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
|
287 |
+
</select>
|
288 |
+
<script type="text/javascript">
|
289 |
+
//<![CDATA[
|
290 |
+
$('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
|
291 |
+
//]]>
|
292 |
+
</script>
|
293 |
+
<input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
|
294 |
+
</div>
|
295 |
+
</div>
|
296 |
+
</li>
|
297 |
+
<li class="fields">
|
298 |
+
<div class="field">
|
299 |
+
<label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
|
300 |
+
<div class="input-box">
|
301 |
+
<input type="text" name="shipping[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="shipping:telephone" onchange="shipping.setSameAsBilling(false);" />
|
302 |
+
</div>
|
303 |
+
</div>
|
304 |
+
<div class="field">
|
305 |
+
<label for="shipping:fax"><?php echo $this->__('Fax') ?></label>
|
306 |
+
<div class="input-box">
|
307 |
+
<input type="text" name="shipping[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="shipping:fax" onchange="shipping.setSameAsBilling(false);" />
|
308 |
+
</div>
|
309 |
+
</div>
|
310 |
+
</li>
|
311 |
+
<?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
|
312 |
+
<li class="control">
|
313 |
+
<input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="shipping:save_in_address_book" onchange="shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="shipping:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
|
314 |
+
<?php else:?>
|
315 |
+
<li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
|
316 |
+
<?php endif;?>
|
317 |
+
</ul>
|
318 |
+
</fieldset>
|
319 |
+
</li>
|
320 |
+
<li class="control">
|
321 |
+
<input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->__('Use Billing Address') ?>" onclick="shipping.setSameAsBilling(this.checked)" class="checkbox" /><label for="shipping:same_as_billing"><?php echo $this->__('Use Billing Address') ?></label>
|
322 |
+
</li>
|
323 |
+
</ul>
|
324 |
+
<?php /*?><div class="buttons-set" id="shipping-buttons-container">
|
325 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
326 |
+
<p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>« </small><?php echo $this->__('Back') ?></a></p>
|
327 |
+
<button type="button" class="button" title="<?php echo $this->__('Continue') ?>" onclick="shipping.save()" ><span><span><?php echo $this->__('Continue') ?></span></span></button>
|
328 |
+
<span id="shipping-please-wait" class="please-wait" style="display:none;">
|
329 |
+
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
|
330 |
+
</span>
|
331 |
+
</div><?php */?>
|
332 |
+
|
333 |
+
</fieldset>
|
334 |
+
</div>
|
335 |
+
</div>
|
336 |
+
<div class="buttons-set" id="billing-buttons-container">
|
337 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
338 |
+
<p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>« </small><?php echo $this->__('Back') ?></a></p>
|
339 |
+
<button type="button" title="<?php echo $this->__('Continue') ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
|
340 |
+
<span class="please-wait" id="billing-please-wait" style="display:none;">
|
341 |
+
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
|
342 |
+
</span>
|
343 |
+
</div>
|
344 |
+
</form>
|
345 |
+
|
346 |
+
<script type="text/javascript">
|
347 |
+
//<![CDATA[
|
348 |
+
var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>');
|
349 |
+
var billingForm = new VarienForm('co-billing-form');
|
350 |
+
|
351 |
+
//billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
|
352 |
+
$('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
|
353 |
+
|
354 |
+
var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'billing:postcode');
|
355 |
+
if ($('onepage-guest-register-button')) {
|
356 |
+
Event.observe($('onepage-guest-register-button'), 'click', function(event) {
|
357 |
+
var billingRememberMe = $('co-billing-form').select('#remember-me-box');
|
358 |
+
if (billingRememberMe.length > 0) {
|
359 |
+
if ($('login:guest') && $('login:guest').checked) {
|
360 |
+
billingRememberMe[0].hide();
|
361 |
+
} else if ($('login:register') && ($('login:register').checked || $('login:register').type == 'hidden')) {
|
362 |
+
billingRememberMe[0].show();
|
363 |
+
}
|
364 |
+
}
|
365 |
+
});
|
366 |
+
}
|
367 |
+
|
368 |
+
var shipping = new Shipping('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveShipping') ?>',
|
369 |
+
'<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
|
370 |
+
var shippingForm = new VarienForm('co-billing-form');
|
371 |
+
shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
|
372 |
+
//shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
|
373 |
+
$('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
|
374 |
+
|
375 |
+
var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');
|
376 |
+
//]]>
|
377 |
+
</script>
|
378 |
+
|
379 |
+
|
380 |
+
<?php /*?><script type="text/javascript">
|
381 |
+
//<![CDATA[
|
382 |
+
var shipping = new Shipping('co-shipping-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveShipping') ?>',
|
383 |
+
'<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
|
384 |
+
var shippingForm = new VarienForm('co-shipping-form');
|
385 |
+
shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
|
386 |
+
//shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
|
387 |
+
$('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
|
388 |
+
|
389 |
+
var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');
|
390 |
+
//]]>
|
391 |
+
</script><?php */?>
|
app/design/frontend/rwd/default/layout/mergeinfo.xml
ADDED
@@ -0,0 +1,110 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* PHXSolution Mergeinfo
|
5 |
+
*
|
6 |
+
* NOTICE OF LICENSE
|
7 |
+
*
|
8 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
9 |
+
* that is bundled with this package in the file LICENSE.txt.
|
10 |
+
* It is also available through the world-wide-web at this URL:
|
11 |
+
* http://opensource.org/licenses/osl-3.0.php
|
12 |
+
* If you did not receive a copy of the license and are unable to
|
13 |
+
* obtain it through the world-wide-web, please send an email
|
14 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
15 |
+
*
|
16 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
17 |
+
*
|
18 |
+
* @category design
|
19 |
+
* @package Phxsolution_Mergeinfo
|
20 |
+
* @author Prakash Vaniya
|
21 |
+
* @contact contact@phxsolution.com
|
22 |
+
* @site www.phxsolution.com
|
23 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
-->
|
27 |
+
|
28 |
+
<layout version="0.1.0">
|
29 |
+
<checkout_onepage_index> <!-- Adding our new step to onepage block -->
|
30 |
+
<reference name="right">
|
31 |
+
<action method="unsetChildren"></action>
|
32 |
+
<block type="page/html_wrapper" name="checkout.progress.wrapper" translate="label">
|
33 |
+
<label>Checkout Progress Wrapper</label>
|
34 |
+
<action method="setElementId"><value>checkout-progress-wrapper</value></action>
|
35 |
+
<block type="checkout/onepage_progress" name="checkout.progress" before="-" template="mergeinfo/checkout/onepage/progress.phtml">
|
36 |
+
<block type="checkout/onepage_progress" name="billing.progress" template="mergeinfo/checkout/onepage/progress/billing.phtml"></block>
|
37 |
+
<block type="checkout/onepage_progress" name="shipping.progress" template="mergeinfo/checkout/onepage/progress/shipping.phtml"></block>
|
38 |
+
<block type="checkout/onepage_progress" name="shippingmethod.progress" template="mergeinfo/checkout/onepage/progress/shipping_method.phtml"></block>
|
39 |
+
<block type="checkout/onepage_progress" name="payment.progress" template="mergeinfo/checkout/onepage/progress/payment.phtml"></block>
|
40 |
+
</block>
|
41 |
+
</block>
|
42 |
+
</reference>
|
43 |
+
<reference name='checkout.onepage'>
|
44 |
+
<action method='setTemplate'><template>mergeinfo/checkout/onepage.phtml</template></action>
|
45 |
+
</reference>
|
46 |
+
<reference name="checkout.onepage.billing"> <!-- Change the template of billing block -->
|
47 |
+
<action method="setTemplate"><template>mergeinfo/persistent/checkout/onepage/billing.phtml</template></action>
|
48 |
+
</reference>
|
49 |
+
<reference name='checkout.progress'> <!-- Change the template of progress block -->
|
50 |
+
<action method='setTemplate'><template>mergeinfo/checkout/onepage/progress.phtml</template></action>
|
51 |
+
</reference>
|
52 |
+
</checkout_onepage_index>
|
53 |
+
<checkout_onepage_progress> <!-- Change the template of progress block -->
|
54 |
+
<block type="checkout/onepage_progress" name="root" output="toHtml" template="mergeinfo/checkout/onepage/progress.phtml">
|
55 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
56 |
+
<block type="checkout/onepage_progress" name="billing.progress" template="mergeinfo/checkout/onepage/progress/billing.phtml"></block>
|
57 |
+
<block type="checkout/onepage_progress" name="shipping.progress" template="mergeinfo/checkout/onepage/progress/shipping.phtml"></block>
|
58 |
+
<block type="checkout/onepage_progress" name="shippingmethod.progress" template="mergeinfo/checkout/onepage/progress/shipping_method.phtml"></block>
|
59 |
+
<block type="checkout/onepage_progress" name="payment.progress" template="mergeinfo/checkout/onepage/progress/payment.phtml"></block>
|
60 |
+
</block>
|
61 |
+
<reference name='root'>
|
62 |
+
<action method='setTemplate'><template>mergeinfo/checkout/onepage/progress.phtml</template></action>
|
63 |
+
</reference>
|
64 |
+
</checkout_onepage_progress>
|
65 |
+
|
66 |
+
<!-- One page checkout progress block -->
|
67 |
+
<checkout_onepage_progress_billing>
|
68 |
+
<!-- Mage_Checkout -->
|
69 |
+
<remove name="right"/>
|
70 |
+
<remove name="left"/>
|
71 |
+
|
72 |
+
<block type="checkout/onepage_progress" name="root" output="toHtml" template="mergeinfo/checkout/onepage/progress/billing.phtml">
|
73 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
74 |
+
</block>
|
75 |
+
</checkout_onepage_progress_billing>
|
76 |
+
|
77 |
+
<checkout_onepage_progress_shipping>
|
78 |
+
<!-- Mage_Checkout -->
|
79 |
+
<remove name="right"/>
|
80 |
+
<remove name="left"/>
|
81 |
+
|
82 |
+
<block type="checkout/onepage_progress" name="root" output="toHtml" template="mergeinfo/checkout/onepage/progress/shipping.phtml">
|
83 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
84 |
+
</block>
|
85 |
+
</checkout_onepage_progress_shipping>
|
86 |
+
|
87 |
+
|
88 |
+
<checkout_onepage_progress_shipping_method>
|
89 |
+
<!-- Mage_Checkout -->
|
90 |
+
<remove name="right"/>
|
91 |
+
<remove name="left"/>
|
92 |
+
|
93 |
+
<block type="checkout/onepage_progress" name="root" output="toHtml" template="mergeinfo/checkout/onepage/progress/shipping_method.phtml">
|
94 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
95 |
+
</block>
|
96 |
+
</checkout_onepage_progress_shipping_method>
|
97 |
+
|
98 |
+
<checkout_onepage_progress_payment>
|
99 |
+
<!-- Mage_Checkout -->
|
100 |
+
<remove name="right"/>
|
101 |
+
<remove name="left"/>
|
102 |
+
|
103 |
+
<block type="checkout/onepage_progress" name="root" output="toHtml" template="mergeinfo/checkout/onepage/progress/payment.phtml">
|
104 |
+
<block type="checkout/onepage_payment_info" name="payment_info">
|
105 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
106 |
+
</block>
|
107 |
+
<action method="setInfoTemplate"><method></method><template></template></action>
|
108 |
+
</block>
|
109 |
+
</checkout_onepage_progress_payment>
|
110 |
+
</layout>
|
app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage.phtml
ADDED
@@ -0,0 +1,64 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* PHXSolution Mergeinfo
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
14 |
+
*
|
15 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
16 |
+
*
|
17 |
+
* @category design
|
18 |
+
* @package Phxsolution_Mergeinfo
|
19 |
+
* @author Prakash Vaniya
|
20 |
+
* @contact contact@phxsolution.com
|
21 |
+
* @site www.phxsolution.com
|
22 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
23 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
24 |
+
*/
|
25 |
+
?>
|
26 |
+
|
27 |
+
<div class="page-title">
|
28 |
+
<h1><?php echo $this->__('Checkout') ?></h1>
|
29 |
+
</div>
|
30 |
+
<script type="text/javascript" src="<?php echo $this->getJsUrl('varien/accordion.js') ?>"></script>
|
31 |
+
<script type="text/javascript" src="<?php echo $this->getSkinUrl('js/opcheckout.js') ?>"></script>
|
32 |
+
<!-- New Code Added Below -->
|
33 |
+
<script type="text/javascript" src="<?php echo $this->getSkinUrl('js/mergeinfocheckout.js') ?>"></script>
|
34 |
+
<script type="text/javascript">countryRegions = <?php echo $this->helper('directory')->getRegionJson() ?></script>
|
35 |
+
<ol class="opc" id="checkoutSteps">
|
36 |
+
<?php $i=0; foreach($this->getSteps() as $_stepId => $_stepInfo): ?>
|
37 |
+
<?php if (!$this->getChild($_stepId) || !$this->getChild($_stepId)->isShow()): continue; endif; $i++ ?>
|
38 |
+
<li id="opc-<?php echo $_stepId ?>" class="section<?php echo !empty($_stepInfo['allow'])?' allow':'' ?><?php echo !empty($_stepInfo['complete'])?' saved':'' ?>">
|
39 |
+
<div class="step-title">
|
40 |
+
<span class="number"><?php echo $i ?></span>
|
41 |
+
<h2><?php echo $_stepInfo['label'] ?></h2>
|
42 |
+
<a href="#"><?php echo $this->__('Edit') ?></a>
|
43 |
+
</div>
|
44 |
+
<div id="checkout-step-<?php echo $_stepId ?>" class="step a-item" style="display:none;">
|
45 |
+
<?php echo $this->getChildHtml($_stepId) ?>
|
46 |
+
</div>
|
47 |
+
</li>
|
48 |
+
<?php endforeach ?>
|
49 |
+
</ol>
|
50 |
+
<script type="text/javascript">
|
51 |
+
//<![CDATA[
|
52 |
+
var accordion = new Accordion('checkoutSteps', '.step-title', true);
|
53 |
+
<?php if($this->getActiveStep()): ?>
|
54 |
+
accordion.openSection('opc-<?php echo $this->getActiveStep() ?>');
|
55 |
+
<?php endif ?>
|
56 |
+
//New Code Added Below
|
57 |
+
var checkout = new Phxsolution(accordion,{
|
58 |
+
progress: '<?php echo $this->getUrl('checkout/onepage/progress') ?>',
|
59 |
+
review: '<?php echo $this->getUrl('checkout/onepage/review') ?>',
|
60 |
+
saveMethod: '<?php echo $this->getUrl('checkout/onepage/saveMethod') ?>',
|
61 |
+
failure: '<?php echo $this->getUrl('checkout/cart') ?>'}
|
62 |
+
);
|
63 |
+
//]]>
|
64 |
+
</script>
|
app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress-bk-1.7.phtml
ADDED
@@ -0,0 +1,53 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<div class="block block-progress opc-block-progress">
|
2 |
+
<div class="block-title">
|
3 |
+
<strong><span><?php echo $this->__('Your Checkout Progress') ?></span></strong>
|
4 |
+
</div>
|
5 |
+
<div class="block-content">
|
6 |
+
<dl>
|
7 |
+
<?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
|
8 |
+
<?php if($this->getCheckout()->getStepData('billing', 'complete')): ?>
|
9 |
+
<dt class="complete">
|
10 |
+
<?php echo $this->__('Billing Address') ?> <span class="separator">|</span> <a href="#billing" onclick="checkout.accordion.openSection('opc-billing'); return false;"><?php echo $this->__('Change') ?></a>
|
11 |
+
</dt>
|
12 |
+
<dd class="complete">
|
13 |
+
<address><?php echo $this->getBilling()->format('html') ?></address>
|
14 |
+
</dd>
|
15 |
+
<?php else: ?>
|
16 |
+
<dt>
|
17 |
+
<?php echo $this->__('Billing Address') ?>
|
18 |
+
</dt>
|
19 |
+
<?php endif; ?>
|
20 |
+
<?php endif; ?>
|
21 |
+
|
22 |
+
<?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
|
23 |
+
<?php if($this->getCheckout()->getStepData('shipping', 'complete')): ?>
|
24 |
+
<dt class="complete">
|
25 |
+
<?php echo $this->__('Shipping Address') ?> <span class="separator">|</span> <a href="#payment" onclick="checkout.accordion.openSection('opc-shipping');return false;"><?php echo $this->__('Change') ?></a>
|
26 |
+
</dt>
|
27 |
+
<dd class="complete">
|
28 |
+
<address><?php echo $this->getShipping()->format('html') ?></address>
|
29 |
+
</dd>
|
30 |
+
<?php else: ?>
|
31 |
+
<dt>
|
32 |
+
<?php echo $this->__('Shipping Address') ?>
|
33 |
+
</dt>
|
34 |
+
<?php endif; ?>
|
35 |
+
<?php endif; ?>
|
36 |
+
|
37 |
+
<?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
|
38 |
+
<?php if($this->getCheckout()->getStepData('payment', 'complete')): ?>
|
39 |
+
<dt class="complete">
|
40 |
+
<?php echo $this->__('Payment Method') ?> <span class="separator">|</span> <a href="#payment" onclick="checkout.accordion.openSection('opc-payment'); return false;"><?php echo $this->__('Change') ?></a>
|
41 |
+
</dt>
|
42 |
+
<dd class="complete">
|
43 |
+
<?php echo $this->getPaymentHtml() ?>
|
44 |
+
</dd>
|
45 |
+
<?php else: ?>
|
46 |
+
<dt>
|
47 |
+
<?php echo $this->__('Payment Method') ?>
|
48 |
+
</dt>
|
49 |
+
<?php endif; ?>
|
50 |
+
<?php endif; ?>
|
51 |
+
</dl>
|
52 |
+
</div>
|
53 |
+
</div>
|
app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress.phtml
ADDED
@@ -0,0 +1,59 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<div class="block block-progress opc-block-progress">
|
28 |
+
<div class="block-title">
|
29 |
+
<strong><span><?php echo $this->__('Your Checkout Progress') ?></span></strong>
|
30 |
+
</div>
|
31 |
+
<div class="block-content">
|
32 |
+
<dl>
|
33 |
+
<?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
|
34 |
+
<div id="billing-progress-opcheckout">
|
35 |
+
<?php echo $this->getChildHtml('billing.progress') ?>
|
36 |
+
</div>
|
37 |
+
<?php endif; ?>
|
38 |
+
|
39 |
+
<?php /* if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
|
40 |
+
<div id="shipping-progress-opcheckout">
|
41 |
+
<?php echo $this->getChildHtml('shipping.progress') ?>
|
42 |
+
</div>
|
43 |
+
<?php endif; */ ?>
|
44 |
+
|
45 |
+
<?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
|
46 |
+
<div id="shipping_method-progress-opcheckout">
|
47 |
+
<?php echo $this->getChildHtml('shippingmethod.progress') ?>
|
48 |
+
</div>
|
49 |
+
<?php endif; ?>
|
50 |
+
|
51 |
+
<?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
|
52 |
+
<div id="payment-progress-opcheckout">
|
53 |
+
<?php echo $this->getChildHtml('payment.progress') ?>
|
54 |
+
</div>
|
55 |
+
<?php endif; ?>
|
56 |
+
</dl>
|
57 |
+
</div>
|
58 |
+
</div>
|
59 |
+
|
app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress/billing.phtml
ADDED
@@ -0,0 +1,47 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<?php if ($this->getCheckout()->getStepData('billing', 'complete')): ?>
|
28 |
+
<dt class="complete">
|
29 |
+
<a href="#billing" onclick="checkout.changeSection('opc-billing'); return false;"><strong><?php echo $this->__('Billing Address') ?></strong></a>
|
30 |
+
</dt>
|
31 |
+
<dd class="complete">
|
32 |
+
<address><?php echo $this->getBilling()->format('html') ?></address>
|
33 |
+
</dd>
|
34 |
+
<dt class="complete">
|
35 |
+
<a href="#billing" onclick="checkout.changeSection('opc-billing'); return false;"><strong><?php echo $this->__('Shipping Address') ?></strong></a>
|
36 |
+
</dt>
|
37 |
+
<dd class="complete">
|
38 |
+
<address><?php echo $this->getShipping()->format('html') ?></address>
|
39 |
+
</dd>
|
40 |
+
<?php else: ?>
|
41 |
+
<dt>
|
42 |
+
<?php echo $this->__('Billing Address') ?>
|
43 |
+
</dt>
|
44 |
+
<dt>
|
45 |
+
<?php echo $this->__('Shipping Address') ?>
|
46 |
+
</dt>
|
47 |
+
<?php endif; ?>
|
app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress/payment.phtml
ADDED
@@ -0,0 +1,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<?php if ($this->getCheckout()->getStepData('payment', 'complete')): ?>
|
28 |
+
<dt class="complete">
|
29 |
+
<a href="#payment" onclick="checkout.changeSection('opc-payment'); return false;"><strong><?php echo $this->__('Payment Method') ?></strong></a>
|
30 |
+
</dt>
|
31 |
+
<dd class="complete">
|
32 |
+
<?php echo $this->getPaymentHtml() ?>
|
33 |
+
</dd>
|
34 |
+
<?php else: ?>
|
35 |
+
<dt>
|
36 |
+
<?php echo $this->__('Payment Method') ?>
|
37 |
+
</dt>
|
38 |
+
<?php endif; ?>
|
app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress/shipping.phtml
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<?php if ($this->getCheckout()->getStepData('shipping', 'complete')): ?>
|
28 |
+
<?php $completeClass = $this->getCheckout()->getStepData('shipping', 'complete') ? 'complete' : ''; ?>
|
29 |
+
<dt class="<?php echo $completeClass ?>">
|
30 |
+
<a href="#shipping" onclick="checkout.changeSection('opc-shipping');return false;"><strong><?php echo $this->__('Shipping Address') ?></strong></a>
|
31 |
+
</dt>
|
32 |
+
<dd class="<?php echo $completeClass ?>">
|
33 |
+
<?php if ($this->getCheckout()->getStepData('shipping', 'complete')): ?>
|
34 |
+
<address><?php echo $this->getShipping()->format('html') ?></address>
|
35 |
+
<?php endif; ?>
|
36 |
+
</dd>
|
37 |
+
<?php else: ?>
|
38 |
+
<dt>
|
39 |
+
<?php echo $this->__('Shipping Address') ?>
|
40 |
+
</dt>
|
41 |
+
<?php endif; ?>
|
app/design/frontend/rwd/default/template/mergeinfo/checkout/onepage/progress/shipping_method.phtml
ADDED
@@ -0,0 +1,54 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category design
|
22 |
+
* @package base_default
|
23 |
+
* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
|
24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
+
*/
|
26 |
+
?>
|
27 |
+
<?php if ($this->getCheckout()->getStepData('shipping_method', 'complete')): ?>
|
28 |
+
<dt class="complete">
|
29 |
+
<a href="#shipping_method" onclick="checkout.changeSection('opc-shipping_method'); return false;"><strong><?php echo $this->__('Shipping Method') ?></strong></a>
|
30 |
+
</dt>
|
31 |
+
<dd class="complete">
|
32 |
+
<?php if ($this->getShippingMethod()): ?>
|
33 |
+
<?php echo $this->getShippingDescription() ?>
|
34 |
+
|
35 |
+
<?php $_excl = $this->getShippingPriceExclTax(); ?>
|
36 |
+
<?php $_incl = $this->getShippingPriceInclTax(); ?>
|
37 |
+
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
38 |
+
<?php echo $_incl; ?>
|
39 |
+
<?php else: ?>
|
40 |
+
<?php echo $_excl; ?>
|
41 |
+
<?php endif; ?>
|
42 |
+
<?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
|
43 |
+
(<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
|
44 |
+
<?php endif; ?>
|
45 |
+
|
46 |
+
<?php else: ?>
|
47 |
+
<?php echo $this->__('Shipping method has not been selected yet') ?>
|
48 |
+
<?php endif; ?>
|
49 |
+
</dd>
|
50 |
+
<?php else: ?>
|
51 |
+
<dt>
|
52 |
+
<?php echo $this->__('Shipping Method') ?>
|
53 |
+
</dt>
|
54 |
+
<?php endif; ?>
|
app/design/frontend/rwd/default/template/mergeinfo/persistent/checkout/onepage/billing.phtml
ADDED
@@ -0,0 +1,391 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* PHXSolution Mergeinfo
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
14 |
+
*
|
15 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
16 |
+
*
|
17 |
+
* @category design
|
18 |
+
* @package Phxsolution_Mergeinfo
|
19 |
+
* @author Prakash Vaniya
|
20 |
+
* @contact contact@phxsolution.com
|
21 |
+
* @site www.phxsolution.com
|
22 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
23 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
24 |
+
*/
|
25 |
+
?>
|
26 |
+
|
27 |
+
<style type="text/css">
|
28 |
+
.form-list .fields {
|
29 |
+
margin-bottom: 10px;
|
30 |
+
}
|
31 |
+
.form-list .field {
|
32 |
+
margin-bottom: 10px;
|
33 |
+
}
|
34 |
+
.form-list li.wide .input-box {
|
35 |
+
width: 315px;
|
36 |
+
}
|
37 |
+
.form-list li.wide select {
|
38 |
+
width: 315px;
|
39 |
+
}
|
40 |
+
</style>
|
41 |
+
<form id="co-billing-form" action="">
|
42 |
+
<div class="col2-set">
|
43 |
+
<div class="col-1">
|
44 |
+
<h3><?php echo $this->__('Billing Info')?></h3>
|
45 |
+
<fieldset>
|
46 |
+
<ul class="form-list">
|
47 |
+
<?php if ($this->customerHasAddresses()): ?>
|
48 |
+
<li class="wide">
|
49 |
+
<label for="billing-address-select"><?php echo $this->__('Select a billing address from your address book or enter a new address.') ?></label>
|
50 |
+
<div class="input-box">
|
51 |
+
<?php echo $this->getAddressesHtmlSelect('billing') ?>
|
52 |
+
</div>
|
53 |
+
</li>
|
54 |
+
<?php endif; ?>
|
55 |
+
<li id="billing-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif; ?>>
|
56 |
+
<fieldset>
|
57 |
+
<input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
|
58 |
+
<ul>
|
59 |
+
<li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
|
60 |
+
<li class="fields">
|
61 |
+
<div class="field">
|
62 |
+
<label for="billing:company"><?php echo $this->__('Company') ?></label>
|
63 |
+
<div class="input-box">
|
64 |
+
<input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
|
65 |
+
</div>
|
66 |
+
</div>
|
67 |
+
<?php if(!$this->isCustomerLoggedIn()): ?>
|
68 |
+
<div class="field">
|
69 |
+
<label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
|
70 |
+
<div class="input-box">
|
71 |
+
<input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
|
72 |
+
</div>
|
73 |
+
</div>
|
74 |
+
<?php endif; ?>
|
75 |
+
</li>
|
76 |
+
<?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
|
77 |
+
<li class="fields">
|
78 |
+
<label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
|
79 |
+
<div class="input-box">
|
80 |
+
<input type="text" title="<?php echo $this->__('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
|
81 |
+
</div>
|
82 |
+
</li>
|
83 |
+
<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
|
84 |
+
<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
|
85 |
+
<li class="fields">
|
86 |
+
<div class="input-box">
|
87 |
+
<input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
|
88 |
+
</div>
|
89 |
+
</li>
|
90 |
+
<?php endfor; ?>
|
91 |
+
<?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
|
92 |
+
<li class="fields">
|
93 |
+
<label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
|
94 |
+
<div class="input-box">
|
95 |
+
<input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
|
96 |
+
</div>
|
97 |
+
</li>
|
98 |
+
<?php endif; ?>
|
99 |
+
<li class="fields">
|
100 |
+
<div class="field">
|
101 |
+
<label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
|
102 |
+
<div class="input-box">
|
103 |
+
<input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
|
104 |
+
</div>
|
105 |
+
</div>
|
106 |
+
<div class="field">
|
107 |
+
<label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
|
108 |
+
<div class="input-box">
|
109 |
+
<input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
|
110 |
+
</div>
|
111 |
+
</div>
|
112 |
+
</li>
|
113 |
+
<li class="fields">
|
114 |
+
<div class="field">
|
115 |
+
<label for="billing:country_id" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
|
116 |
+
<div class="input-box">
|
117 |
+
<?php echo $this->getCountryHtmlSelect('billing') ?>
|
118 |
+
</div>
|
119 |
+
</div>
|
120 |
+
<div class="field">
|
121 |
+
<label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
|
122 |
+
<div class="input-box">
|
123 |
+
<select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
|
124 |
+
<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
|
125 |
+
</select>
|
126 |
+
<script type="text/javascript">
|
127 |
+
//<![CDATA[
|
128 |
+
$('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
|
129 |
+
//]]>
|
130 |
+
</script>
|
131 |
+
<input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
|
132 |
+
</div>
|
133 |
+
</div>
|
134 |
+
</li>
|
135 |
+
<li class="fields">
|
136 |
+
<div class="field">
|
137 |
+
<label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
|
138 |
+
<div class="input-box">
|
139 |
+
<input type="text" name="billing[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
|
140 |
+
</div>
|
141 |
+
</div>
|
142 |
+
<div class="field">
|
143 |
+
<label for="billing:fax"><?php echo $this->__('Fax') ?></label>
|
144 |
+
<div class="input-box">
|
145 |
+
<input type="text" name="billing[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="billing:fax" />
|
146 |
+
</div>
|
147 |
+
</div>
|
148 |
+
</li>
|
149 |
+
<?php if(!$this->isCustomerLoggedIn()): ?>
|
150 |
+
|
151 |
+
<?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
|
152 |
+
<?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
|
153 |
+
<?php if ($_dob->isEnabled() || $_gender->isEnabled()): ?>
|
154 |
+
<li class="fields">
|
155 |
+
<?php if ($_dob->isEnabled()): ?>
|
156 |
+
<div class="field">
|
157 |
+
<?php echo $_dob->setDate($this->getQuote()->getCustomerDob())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
|
158 |
+
</div>
|
159 |
+
<?php endif; ?>
|
160 |
+
<?php if ($_gender->isEnabled()): ?>
|
161 |
+
<div class="field">
|
162 |
+
<?php echo $_gender->setGender($this->getQuote()->getCustomerGender())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
|
163 |
+
</div>
|
164 |
+
<?php endif ?>
|
165 |
+
</li>
|
166 |
+
<?php endif ?>
|
167 |
+
|
168 |
+
<?php if ($this->isTaxvatEnabled()):?>
|
169 |
+
<li><?php echo $this->getTaxvatHtml() ?></li>
|
170 |
+
<?php endif; ?>
|
171 |
+
|
172 |
+
<li class="fields" id="register-customer-password">
|
173 |
+
<div class="field">
|
174 |
+
<label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
175 |
+
<div class="input-box">
|
176 |
+
<input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
|
177 |
+
</div>
|
178 |
+
</div>
|
179 |
+
<div class="field">
|
180 |
+
<label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
|
181 |
+
<div class="input-box">
|
182 |
+
<input type="password" name="billing[confirm_password]" title="<?php echo $this->__('Confirm Password') ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
|
183 |
+
</div>
|
184 |
+
</div>
|
185 |
+
</li>
|
186 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
187 |
+
<?php endif; ?>
|
188 |
+
<?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
|
189 |
+
<li class="control">
|
190 |
+
<input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="billing:save_in_address_book" onchange="if(window.shipping) shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label>
|
191 |
+
</li>
|
192 |
+
<?php else:?>
|
193 |
+
<li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
|
194 |
+
<?php endif; ?>
|
195 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
196 |
+
</ul>
|
197 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
198 |
+
</fieldset>
|
199 |
+
</li>
|
200 |
+
<?php /* if ($this->canShip()): ?>
|
201 |
+
<li class="control">
|
202 |
+
<input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1" checked="checked" title="<?php echo $this->__('Ship to this address') ?>" onclick="$('shipping:same_as_billing').checked = true;" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo $this->__('Ship to this address') ?></label></li>
|
203 |
+
<li class="control">
|
204 |
+
<input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0" title="<?php echo $this->__('Ship to different address') ?>" onclick="$('shipping:same_as_billing').checked = false;" class="radio" /><label for="billing:use_for_shipping_no"><?php echo $this->__('Ship to different address') ?></label>
|
205 |
+
</li>
|
206 |
+
<?php endif; */ ?>
|
207 |
+
</ul>
|
208 |
+
<?php if (!$this->canShip()): ?>
|
209 |
+
<input type="hidden" name="billing[use_for_shipping]" value="1" />
|
210 |
+
<?php endif; ?>
|
211 |
+
</fieldset>
|
212 |
+
</div>
|
213 |
+
<div class="col-2">
|
214 |
+
<h3><?php echo $this->__('Shipping Information')?></h3>
|
215 |
+
<fieldset>
|
216 |
+
<ul class="form-list">
|
217 |
+
<?php if ($this->customerHasAddresses()): ?>
|
218 |
+
<li class="wide">
|
219 |
+
<label for="shipping-address-select"><?php echo $this->__('Select a shipping address from your address book or enter a new address.') ?></label>
|
220 |
+
<div class="input-box">
|
221 |
+
<?php echo $this->getAddressesHtmlSelect('shipping') ?>
|
222 |
+
</div>
|
223 |
+
</li>
|
224 |
+
<?php endif ?>
|
225 |
+
<li id="shipping-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif ?>>
|
226 |
+
<fieldset>
|
227 |
+
<input type="hidden" name="shipping[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="shipping:address_id" />
|
228 |
+
<ul>
|
229 |
+
<li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress())->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->setFieldParams('onchange="shipping.setSameAsBilling(false)"')->toHtml() ?></li>
|
230 |
+
<li class="fields">
|
231 |
+
<div class="fields">
|
232 |
+
<label for="shipping:company"><?php echo $this->__('Company') ?></label>
|
233 |
+
<div class="input-box">
|
234 |
+
<input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" onchange="shipping.setSameAsBilling(false);" />
|
235 |
+
</div>
|
236 |
+
</div>
|
237 |
+
</li>
|
238 |
+
<?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
|
239 |
+
<li class="fields">
|
240 |
+
<label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
|
241 |
+
<div class="input-box">
|
242 |
+
<input type="text" title="<?php echo $this->__('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
|
243 |
+
</div>
|
244 |
+
</li>
|
245 |
+
<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
|
246 |
+
<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
|
247 |
+
<li class="fields">
|
248 |
+
<div class="input-box">
|
249 |
+
<input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
|
250 |
+
</div>
|
251 |
+
</li>
|
252 |
+
<?php endfor; ?>
|
253 |
+
<?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
|
254 |
+
<li class="fields">
|
255 |
+
<label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
|
256 |
+
<div class="input-box">
|
257 |
+
<input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()); ?>" title="<?php echo $this->__('VAT Number'); ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
|
258 |
+
</div>
|
259 |
+
</li>
|
260 |
+
<?php endif; ?>
|
261 |
+
<li class="fields">
|
262 |
+
<div class="field">
|
263 |
+
<label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
|
264 |
+
<div class="input-box">
|
265 |
+
<input type="text" title="<?php echo $this->__('City') ?>" name="shipping[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="shipping:city" onchange="shipping.setSameAsBilling(false);" />
|
266 |
+
</div>
|
267 |
+
</div>
|
268 |
+
<div class="field">
|
269 |
+
<label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
|
270 |
+
<div class="input-box">
|
271 |
+
<input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" onchange="shipping.setSameAsBilling(false);" />
|
272 |
+
</div>
|
273 |
+
</div>
|
274 |
+
</li>
|
275 |
+
<li class="fields">
|
276 |
+
<div class="field">
|
277 |
+
<label for="shipping:country_id" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
|
278 |
+
<div class="input-box">
|
279 |
+
<?php echo $this->getCountryHtmlSelect('shipping') ?>
|
280 |
+
</div>
|
281 |
+
</div>
|
282 |
+
<div class="field">
|
283 |
+
<label for="shipping:region" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
|
284 |
+
<div class="input-box">
|
285 |
+
<select id="shipping:region_id" name="shipping[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
|
286 |
+
<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
|
287 |
+
</select>
|
288 |
+
<script type="text/javascript">
|
289 |
+
//<![CDATA[
|
290 |
+
$('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
|
291 |
+
//]]>
|
292 |
+
</script>
|
293 |
+
<input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
|
294 |
+
</div>
|
295 |
+
</div>
|
296 |
+
</li>
|
297 |
+
<li class="fields">
|
298 |
+
<div class="field">
|
299 |
+
<label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
|
300 |
+
<div class="input-box">
|
301 |
+
<input type="text" name="shipping[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="shipping:telephone" onchange="shipping.setSameAsBilling(false);" />
|
302 |
+
</div>
|
303 |
+
</div>
|
304 |
+
<div class="field">
|
305 |
+
<label for="shipping:fax"><?php echo $this->__('Fax') ?></label>
|
306 |
+
<div class="input-box">
|
307 |
+
<input type="text" name="shipping[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="shipping:fax" onchange="shipping.setSameAsBilling(false);" />
|
308 |
+
</div>
|
309 |
+
</div>
|
310 |
+
</li>
|
311 |
+
<?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
|
312 |
+
<li class="control">
|
313 |
+
<input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="shipping:save_in_address_book" onchange="shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="shipping:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
|
314 |
+
<?php else:?>
|
315 |
+
<li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
|
316 |
+
<?php endif;?>
|
317 |
+
</ul>
|
318 |
+
</fieldset>
|
319 |
+
</li>
|
320 |
+
<li class="control">
|
321 |
+
<input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->__('Use Billing Address') ?>" onclick="shipping.setSameAsBilling(this.checked)" class="checkbox" /><label for="shipping:same_as_billing"><?php echo $this->__('Use Billing Address') ?></label>
|
322 |
+
</li>
|
323 |
+
</ul>
|
324 |
+
<?php /*?><div class="buttons-set" id="shipping-buttons-container">
|
325 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
326 |
+
<p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>« </small><?php echo $this->__('Back') ?></a></p>
|
327 |
+
<button type="button" class="button" title="<?php echo $this->__('Continue') ?>" onclick="shipping.save()" ><span><span><?php echo $this->__('Continue') ?></span></span></button>
|
328 |
+
<span id="shipping-please-wait" class="please-wait" style="display:none;">
|
329 |
+
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
|
330 |
+
</span>
|
331 |
+
</div><?php */?>
|
332 |
+
|
333 |
+
</fieldset>
|
334 |
+
</div>
|
335 |
+
</div>
|
336 |
+
<div class="buttons-set" id="billing-buttons-container">
|
337 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
338 |
+
<p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>« </small><?php echo $this->__('Back') ?></a></p>
|
339 |
+
<button type="button" title="<?php echo $this->__('Continue') ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
|
340 |
+
<span class="please-wait" id="billing-please-wait" style="display:none;">
|
341 |
+
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
|
342 |
+
</span>
|
343 |
+
</div>
|
344 |
+
</form>
|
345 |
+
|
346 |
+
<script type="text/javascript">
|
347 |
+
//<![CDATA[
|
348 |
+
var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>');
|
349 |
+
var billingForm = new VarienForm('co-billing-form');
|
350 |
+
|
351 |
+
//billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
|
352 |
+
$('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
|
353 |
+
|
354 |
+
var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'billing:postcode');
|
355 |
+
if ($('onepage-guest-register-button')) {
|
356 |
+
Event.observe($('onepage-guest-register-button'), 'click', function(event) {
|
357 |
+
var billingRememberMe = $('co-billing-form').select('#remember-me-box');
|
358 |
+
if (billingRememberMe.length > 0) {
|
359 |
+
if ($('login:guest') && $('login:guest').checked) {
|
360 |
+
billingRememberMe[0].hide();
|
361 |
+
} else if ($('login:register') && ($('login:register').checked || $('login:register').type == 'hidden')) {
|
362 |
+
billingRememberMe[0].show();
|
363 |
+
}
|
364 |
+
}
|
365 |
+
});
|
366 |
+
}
|
367 |
+
|
368 |
+
var shipping = new Shipping('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveShipping') ?>',
|
369 |
+
'<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
|
370 |
+
var shippingForm = new VarienForm('co-billing-form');
|
371 |
+
shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
|
372 |
+
//shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
|
373 |
+
$('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
|
374 |
+
|
375 |
+
var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');
|
376 |
+
//]]>
|
377 |
+
</script>
|
378 |
+
|
379 |
+
|
380 |
+
<?php /*?><script type="text/javascript">
|
381 |
+
//<![CDATA[
|
382 |
+
var shipping = new Shipping('co-shipping-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveShipping') ?>',
|
383 |
+
'<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
|
384 |
+
var shippingForm = new VarienForm('co-shipping-form');
|
385 |
+
shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
|
386 |
+
//shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
|
387 |
+
$('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
|
388 |
+
|
389 |
+
var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');
|
390 |
+
//]]>
|
391 |
+
</script><?php */?>
|
app/etc/modules/Phxsolution_Mergeinfo.xml
ADDED
@@ -0,0 +1,35 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* PHXSolution Mergeinfo
|
5 |
+
*
|
6 |
+
* NOTICE OF LICENSE
|
7 |
+
*
|
8 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
9 |
+
* that is bundled with this package in the file LICENSE.txt.
|
10 |
+
* It is also available through the world-wide-web at this URL:
|
11 |
+
* http://opensource.org/licenses/osl-3.0.php
|
12 |
+
* If you did not receive a copy of the license and are unable to
|
13 |
+
* obtain it through the world-wide-web, please send an email
|
14 |
+
* to license@magentocommerce.com so you can be sent a copy immediately.
|
15 |
+
*
|
16 |
+
* Original code copyright (c) 2008 Irubin Consulting Inc. DBA Varien
|
17 |
+
*
|
18 |
+
* @category global configuration
|
19 |
+
* @package Phxsolution_Mergeinfo
|
20 |
+
* @author Prakash Vaniya
|
21 |
+
* @contact contact@phxsolution.com
|
22 |
+
* @site www.phxsolution.com
|
23 |
+
* @copyright Copyright (c) 2014 PHXSolution Mergeinfo
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
-->
|
27 |
+
|
28 |
+
<config>
|
29 |
+
<modules>
|
30 |
+
<Phxsolution_Mergeinfo>
|
31 |
+
<active>true</active>
|
32 |
+
<codePool>community</codePool>
|
33 |
+
</Phxsolution_Mergeinfo>
|
34 |
+
</modules>
|
35 |
+
</config>
|
app/locale/en_US/Phxsolution_Mergeinfo.csv
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
Billing Information,Personal Information
|
2 |
+
Billing Info,Billing Information
|
package.xml
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<package>
|
3 |
+
<name>Phxsolution_Mergeinfo</name>
|
4 |
+
<version>0.1.0</version>
|
5 |
+
<stability>stable</stability>
|
6 |
+
<license uri="http://opensource.org/licenses/osl-3.0.php">OSLv3.0</license>
|
7 |
+
<channel>community</channel>
|
8 |
+
<extends/>
|
9 |
+
<summary>Free module Merges Billing & Shipping Information/Addresses at checkout for easiness of customer to fill up.</summary>
|
10 |
+
<description>Nowadays it seems that shorten the checkout process increases the interest of customers to be on site and reduces the no of chance to let customer go.
|
11 |
+

|
12 |
+
This Free module merges two address steps of onepage checkout i.e.Billing Information & Shipping Information in one step.</description>
|
13 |
+
<notes>Fixed minor bugs, compatible with Magento CE Version 1.8 & 1.9</notes>
|
14 |
+
<authors><author><name>Prakash Vaniya</name><user>phxsolution</user><email>contact@phxsolution.com</email></author></authors>
|
15 |
+
<date>2014-12-04</date>
|
16 |
+
<time>13:10:22</time>
|
17 |
+
<contents><target name="mageetc"><dir name="modules"><file name="Phxsolution_Mergeinfo.xml" hash="401bdd38a9b952dc8ce39885d184632d"/></dir></target><target name="magecommunity"><dir name="Phxsolution"><dir name="Mergeinfo"><dir name="Block"><file name="Onepage.php" hash="91581ac861e7f90e3241bf79a2de8098"/></dir><dir name="Helper"><file name="Data.php" hash="73a0b85c28161c7548df0710fb1b541d"/></dir><dir name="controllers"><file name="OnepageController.php" hash="016f0e5e14ac43386e2557d2990a6fe8"/></dir><dir name="etc"><file name="config.xml" hash="c5ec71411b83c1d7f1971abde89040e2"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="mergeinfo.xml" hash="b85ed257c2fe720a30af37a5b39f29e3"/></dir><dir name="template"><dir name="mergeinfo"><dir name="checkout"><dir name="onepage"><dir name="progress"><file name="billing.phtml" hash="c12a051e270959e8bdcfc2fb3d53e22f"/><file name="payment.phtml" hash="39ef9e41120a567cbcfcdbd131e2263c"/><file name="shipping.phtml" hash="7df3a0cc95d6d92b6eacd31662b8cf1c"/><file name="shipping_method.phtml" hash="6126b7fd40c1040802898ff9b52b392c"/></dir><file name="progress.phtml" hash="b657f79cec43fc7d7314f94559213550"/></dir><file name="onepage.phtml" hash="058aee8a47bc9fd9701e273866b18ae8"/></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="158dfcd72bc0606a9d1654e27c62245f"/></dir></dir></dir></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="layout"><file name="mergeinfo.xml" hash="b85ed257c2fe720a30af37a5b39f29e3"/></dir><dir name="template"><dir name="mergeinfo"><dir name="checkout"><dir name="onepage"><dir name="progress"><file name="billing.phtml" hash="c12a051e270959e8bdcfc2fb3d53e22f"/><file name="payment.phtml" hash="39ef9e41120a567cbcfcdbd131e2263c"/><file name="shipping.phtml" hash="7df3a0cc95d6d92b6eacd31662b8cf1c"/><file name="shipping_method.phtml" hash="6126b7fd40c1040802898ff9b52b392c"/></dir><file name="progress-bk-1.7.phtml" hash="cf6058202c8cdd97e40c88978fd74dd5"/><file name="progress.phtml" hash="b657f79cec43fc7d7314f94559213550"/></dir><file name="onepage.phtml" hash="058aee8a47bc9fd9701e273866b18ae8"/></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="158dfcd72bc0606a9d1654e27c62245f"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Phxsolution_Mergeinfo.csv" hash="03d616625d79d41243511eb3ad048464"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="js"><file name="mergeinfocheckout.js" hash="d7fbf7a3a7f941bac80bf48816071062"/></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="js"><file name="mergeinfocheckout.js" hash="d7fbf7a3a7f941bac80bf48816071062"/></dir></dir></dir></dir></target></contents>
|
18 |
+
<compatible/>
|
19 |
+
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
20 |
+
</package>
|
skin/frontend/default/default/js/mergeinfocheckout.js
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
var Phxsolution = Class.create(Checkout, {
|
2 |
+
initialize: function($super,accordion, urls){
|
3 |
+
$super(accordion, urls);
|
4 |
+
//New Code Addded
|
5 |
+
this.steps = ['login','billing', 'shipping_method', 'payment', 'review'];
|
6 |
+
}
|
7 |
+
});
|
skin/frontend/rwd/default/js/mergeinfocheckout.js
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
var Phxsolution = Class.create(Checkout, {
|
2 |
+
initialize: function($super,accordion, urls){
|
3 |
+
$super(accordion, urls);
|
4 |
+
//New Code Addded
|
5 |
+
this.steps = ['login','billing', 'shipping_method', 'payment', 'review'];
|
6 |
+
}
|
7 |
+
});
|