Version Notes
* Minor improvements
Download this release
Release Info
| Developer | Capayable |
| Extension | Tritac_Capayable |
| Version | 2.3.1 |
| Comparing to | |
| See all releases | |
Code changes from version 2.3.0 to 2.3.1
app/code/community/Tritac/Capayable/etc/config.xml
CHANGED
|
@@ -10,7 +10,7 @@
|
|
| 10 |
<config>
|
| 11 |
<modules>
|
| 12 |
<Tritac_Capayable>
|
| 13 |
-
<version>2.3.
|
| 14 |
</Tritac_Capayable>
|
| 15 |
</modules>
|
| 16 |
|
| 10 |
<config>
|
| 11 |
<modules>
|
| 12 |
<Tritac_Capayable>
|
| 13 |
+
<version>2.3.1</version>
|
| 14 |
</Tritac_Capayable>
|
| 15 |
</modules>
|
| 16 |
|
app/design/frontend/base/default/template/capayable/form.phtml
CHANGED
|
@@ -43,7 +43,7 @@
|
|
| 43 |
}
|
| 44 |
//if($_customer->getCustomerMiddlename() && $isLoggedIn)
|
| 45 |
// $initials = $_customer->getCustomerMiddlename();
|
| 46 |
-
$hasMageWorldOSC = Mage::helper('core')->isModuleEnabled('MW_Onestepcheckout');
|
| 47 |
|
| 48 |
$postcode = $billingAddress->getData("postcode");
|
| 49 |
if($_customer->getPostalCode() && $isLoggedIn) {
|
|
@@ -58,14 +58,6 @@
|
|
| 58 |
?>
|
| 59 |
<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
|
| 60 |
|
| 61 |
-
<li>
|
| 62 |
-
<label for="<?php echo $_code?>_middlename" class="required"><em>*</em><?php echo $this->__('Initials')?></label>
|
| 63 |
-
<div class="input-box">
|
| 64 |
-
<input type="text" id="<?php echo $_code?>_middlename" name="payment[customer_middlename]" class="input-text required-entry" value="<?php echo $initials; ?>" />
|
| 65 |
-
</div>
|
| 66 |
-
</li>
|
| 67 |
-
|
| 68 |
-
|
| 69 |
<?php if(!$_quote->getCustomerDob()): ?>
|
| 70 |
<li>
|
| 71 |
<label for="<?php echo $_code?>_month" class="required"><em>*</em><?php echo $this->__('Date of Birth') ?></label>
|
|
@@ -123,6 +115,7 @@
|
|
| 123 |
</script>
|
| 124 |
</li>
|
| 125 |
<?php endif ?>
|
|
|
|
| 126 |
<?php if(!$_quote->getCustomerGender()): ?>
|
| 127 |
<li>
|
| 128 |
<label for="<?php echo $_code?>_gender" class="required"><em>*</em><?php echo $this->__('Gender') ?></label>
|
|
@@ -174,39 +167,73 @@
|
|
| 174 |
<input type="text" id="<?php echo $_code?>_corporation_name" name="payment[corporation_name]" class="input-text" value="<?php if($_customer->getCorporationName() && $isLoggedIn) echo $_customer->getCorporationName()?>" />
|
| 175 |
</div>
|
| 176 |
</li>
|
| 177 |
-
|
| 178 |
-
|
| 179 |
-
|
| 180 |
-
|
| 181 |
-
|
| 182 |
-
|
| 183 |
-
|
| 184 |
-
<
|
| 185 |
-
|
| 186 |
-
|
| 187 |
-
|
| 188 |
-
|
| 189 |
-
|
| 190 |
-
|
| 191 |
-
|
| 192 |
-
<
|
| 193 |
-
|
| 194 |
-
|
| 195 |
-
|
| 196 |
-
|
| 197 |
-
|
| 198 |
-
|
| 199 |
-
|
| 200 |
-
|
| 201 |
-
|
| 202 |
-
|
| 203 |
-
|
| 204 |
-
|
| 205 |
-
|
| 206 |
-
</
|
| 207 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 208 |
|
| 209 |
-
</ul>
|
| 210 |
|
| 211 |
<script type="text/javascript">
|
| 212 |
//<![CDATA[
|
|
@@ -292,6 +319,8 @@
|
|
| 292 |
<?php if ($hasMageWorldOSC): ?>
|
| 293 |
listenAndApplyChanges('#billing\\:company', '#capayable_corporation_name');
|
| 294 |
listenAndApplyChanges('#billing\\:firstname', '#capayable_middlename');
|
|
|
|
|
|
|
| 295 |
listenAndApplyChanges('#billing\\:postcode', '#capayable_postcode');
|
| 296 |
listenAndApplyChanges('#billing\\:city', '#capayable_city');
|
| 297 |
<?php endif ?>
|
| 43 |
}
|
| 44 |
//if($_customer->getCustomerMiddlename() && $isLoggedIn)
|
| 45 |
// $initials = $_customer->getCustomerMiddlename();
|
| 46 |
+
$hasMageWorldOSC = Mage::helper('core')->isModuleEnabled('MW_Onestepcheckout') || true;
|
| 47 |
|
| 48 |
$postcode = $billingAddress->getData("postcode");
|
| 49 |
if($_customer->getPostalCode() && $isLoggedIn) {
|
| 58 |
?>
|
| 59 |
<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
|
| 60 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 61 |
<?php if(!$_quote->getCustomerDob()): ?>
|
| 62 |
<li>
|
| 63 |
<label for="<?php echo $_code?>_month" class="required"><em>*</em><?php echo $this->__('Date of Birth') ?></label>
|
| 115 |
</script>
|
| 116 |
</li>
|
| 117 |
<?php endif ?>
|
| 118 |
+
|
| 119 |
<?php if(!$_quote->getCustomerGender()): ?>
|
| 120 |
<li>
|
| 121 |
<label for="<?php echo $_code?>_gender" class="required"><em>*</em><?php echo $this->__('Gender') ?></label>
|
| 167 |
<input type="text" id="<?php echo $_code?>_corporation_name" name="payment[corporation_name]" class="input-text" value="<?php if($_customer->getCorporationName() && $isLoggedIn) echo $_customer->getCorporationName()?>" />
|
| 168 |
</div>
|
| 169 |
</li>
|
| 170 |
+
|
| 171 |
+
<?php if($hasMageWorldOSC): ?>
|
| 172 |
+
|
| 173 |
+
<input type="hidden" id="<?php echo $_code?>_middlename" name="payment[customer_middlename]" class="input-text required-entry" value="<?php echo $initials; ?>" />
|
| 174 |
+
|
| 175 |
+
<input type="hidden" id="<?php echo $_code?>_street" name="payment[street]" class="input-text required-entry" value="<?php if($_customer->getStreet(0) && $isLoggedIn) echo $_customer->getStreet(0)?>" />
|
| 176 |
+
<input type="hidden" id="<?php echo $_code?>_house_number" name="payment[house_number]" class="validate-digits validate-greater-than-zero input-text required-entry" value="<?php if($_customer->getStreet(1) && $isLoggedIn) echo $_customer->getStreet(1)?>" />
|
| 177 |
+
<input type="hidden" id="<?php echo $_code?>_house_suffix" name="payment[house_suffix]" class="input-text" value="<?php if($_customer->getHouseSuffix() && $isLoggedIn) echo $_customer->getHouseSuffix()?>" />
|
| 178 |
+
|
| 179 |
+
<input type="hidden" id="<?php echo $_code?>_postcode" name="payment[postcode]" class="input-text required-entry" value="<?php echo $postcode; ?>" />
|
| 180 |
+
<input type="hidden" id="<?php echo $_code?>_city" name="payment[city]" class="input-text required-entry" value="<?php echo $city; ?>" />
|
| 181 |
+
|
| 182 |
+
<?php else: ?>
|
| 183 |
+
|
| 184 |
+
<?php if(!$initials): ?>
|
| 185 |
+
<li>
|
| 186 |
+
<label for="<?php echo $_code?>_middlename" class="required"><em>*</em><?php echo $this->__('Initials')?></label>
|
| 187 |
+
<div class="input-box">
|
| 188 |
+
<input type="text" id="<?php echo $_code?>_middlename" name="payment[customer_middlename]" class="input-text required-entry" value="<?php echo $initials; ?>" />
|
| 189 |
+
</div>
|
| 190 |
+
</li>
|
| 191 |
+
<?php endif; ?>
|
| 192 |
+
|
| 193 |
+
|
| 194 |
+
<li>
|
| 195 |
+
<label for="<?php echo $_code?>_street" class="required"><em>*</em><?php echo $this->__('Street')?></label>
|
| 196 |
+
<div class="input-box">
|
| 197 |
+
<input type="text" id="<?php echo $_code?>_street" name="payment[street]" class="input-text required-entry" value="<?php if($_customer->getStreet() && $isLoggedIn) echo $_customer->getStreet()?>" />
|
| 198 |
+
</div>
|
| 199 |
+
</li>
|
| 200 |
+
|
| 201 |
+
<li>
|
| 202 |
+
<label for="<?php echo $_code?>_house_number" class="required"><em>*</em><?php echo $this->__('House number')?></label>
|
| 203 |
+
<div class="input-box">
|
| 204 |
+
<input type="text" id="<?php echo $_code?>_house_number" name="payment[house_number]" class="validate-digits validate-greater-than-zero input-text required-entry" value="<?php if($_customer->getHouseNumber() && $isLoggedIn) echo $_customer->getHouseNumber()?>" />
|
| 205 |
+
</div>
|
| 206 |
+
</li>
|
| 207 |
+
<li>
|
| 208 |
+
<label for="<?php echo $_code?>_house_suffix"><?php echo $this->__('House number suffix')?></label>
|
| 209 |
+
<div class="input-box">
|
| 210 |
+
<input type="text" id="<?php echo $_code?>_house_suffix" name="payment[house_suffix]" class="input-text" value="<?php if($_customer->getHouseSuffix() && $isLoggedIn) echo $_customer->getHouseSuffix()?>" />
|
| 211 |
+
</div>
|
| 212 |
+
</li>
|
| 213 |
+
|
| 214 |
+
<?php if(!$postcode): ?>
|
| 215 |
+
|
| 216 |
+
<li>
|
| 217 |
+
<label for="<?php echo $_code?>_postcode" class="required"><em>*</em><?php echo $this->__('Postal Code')?></label>
|
| 218 |
+
<div class="input-box">
|
| 219 |
+
<input type="text" id="<?php echo $_code?>_postcode" name="payment[postcode]" class="input-text required-entry" value="<?php echo $postcode; ?>" />
|
| 220 |
+
</div>
|
| 221 |
+
</li>
|
| 222 |
+
|
| 223 |
+
<?php endif; ?>
|
| 224 |
+
|
| 225 |
+
<?php if(!$city): ?>
|
| 226 |
+
<li>
|
| 227 |
+
<label for="<?php echo $_code?>_city" class="required"><em>*</em><?php echo $this->__('City')?></label>
|
| 228 |
+
<div class="input-box">
|
| 229 |
+
<input type="text" id="<?php echo $_code?>_city" name="payment[city]" class="input-text required-entry" value="<?php echo $city; ?>" />
|
| 230 |
+
</div>
|
| 231 |
+
</li>
|
| 232 |
+
<?php endif; ?>
|
| 233 |
+
|
| 234 |
+
<?php endif; ?>
|
| 235 |
|
| 236 |
+
</ul>
|
| 237 |
|
| 238 |
<script type="text/javascript">
|
| 239 |
//<