This repository has been archived by the owner on Apr 26, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
close #29 Fixed: Bug in eWay payment module, it's always displaying t…
…est text
- Loading branch information
1 parent
0378d49
commit cb634e9
Showing
3 changed files
with
176 additions
and
172 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
342 changes: 171 additions & 171 deletions
342
Payments/eway/upload/catalog/view/theme/default/template/payment/eway.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,185 +1,185 @@ | ||
| <?php if (isset($error)) { ?> | ||
| <div class="alert alert-danger">Payment Error: <?php echo $error; ?></div> | ||
| <div class="alert alert-danger">Payment Error: <?php echo $error; ?></div> | ||
| <?php } else { ?> | ||
| <form action="<?php echo $action; ?>" method="POST" class="form-horizontal" id="eway-payment-form"> | ||
| <fieldset id="payment"> | ||
| <legend><?php echo $text_credit_card; ?></legend> | ||
| <input type="hidden" name="EWAY_ACCESSCODE" value="<?php echo $AccessCode; ?>" /> | ||
| <?php if (isset($text_testing)) { ?> | ||
| <div class="alert alert-warning"><?php echo $text_testing; ?></div> | ||
| <?php } ?> | ||
| <div class="form-group"> | ||
| <div class="col-sm-12"> | ||
| <ul> | ||
| <?php if ($payment_type['visa'] == 1 || $payment_type['mastercard'] == 1 || $payment_type['diners'] == 1 || $payment_type['jcb'] == 1 || $payment_type['amex'] == 1) { ?> | ||
| <label><input type="radio" name="EWAY_PAYMENTTYPE" id="eway-radio-cc" value="creditcard" checked="checked" onchange="javascript:select_eWAYPaymentOption('creditcard')" /> | ||
| <?php if ($payment_type['visa'] == 1) { ?> | ||
| <img src="catalog/view/theme/default/image/eway_creditcard_visa.png" height="30" alt="Visa" /> | ||
| <?php } ?> | ||
| <?php if ($payment_type['mastercard'] == 1) { ?> | ||
| <img src="catalog/view/theme/default/image/eway_creditcard_master.png" height="30" alt="MasterCard" /> | ||
| <?php } ?> | ||
| <?php if ($payment_type['diners'] == 1) { ?> | ||
| <img src="catalog/view/theme/default/image/eway_creditcard_diners.png" height="30" alt="Diners Club" /> | ||
| <?php } ?> | ||
| <?php if ($payment_type['jcb'] == 1) { ?> | ||
| <img src="catalog/view/theme/default/image/eway_creditcard_jcb.png" height="30" alt="JCB" /> | ||
| <?php } ?> | ||
| <?php if ($payment_type['amex'] == 1) { ?> | ||
| <img src="catalog/view/theme/default/image/eway_creditcard_amex.png" height="30" alt="AMEX" /> | ||
| <?php } ?> | ||
| </label> | ||
| <?php } ?> | ||
| <?php if ($payment_type['paypal'] == 1) { ?> | ||
| <label><input type="radio" name="EWAY_PAYMENTTYPE" value="paypal" onchange="javascript:select_eWAYPaymentOption(paypal)" /> <img src="catalog/view/theme/default/image/eway_paypal.png" height="30" alt="'.$text_card_type_pp.'" /></label> '; | ||
| <?php } ?> | ||
| <?php if ($payment_type['masterpass'] == 1) { ?> | ||
| <label><input type="radio" name="EWAY_PAYMENTTYPE" value="masterpass" onchange="javascript:select_eWAYPaymentOption(masterpass)" /> <img src="catalog/view/theme/default/image/eway_masterpass.png" height="30" alt="'.$text_card_type_mp.'" /></label> '; | ||
| <?php } ?> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| <?php if ($payment_type['paypal'] == 1) { ?> | ||
| <p id="tip-paypal" style="display:none;"><?php echo $text_type_help; ?><?php echo $text_card_type_pp; ?></p> | ||
| <?php } ?> | ||
| <?php if ($payment_type['masterpass'] == 1) { ?> | ||
| <p id="tip-masterpass" style="display:none;"><?php echo $text_type_help; ?><?php echo $text_card_type_mp; ?></p> | ||
| <?php } ?> | ||
| <?php if ($payment_type['visa'] == 1 || $payment_type['mastercard'] == 1 || $payment_type['diners'] == 1 || $payment_type['jcb'] == 1 || $payment_type['amex'] == 1) { ?> | ||
| <div id="creditcard-info"> | ||
| <div class="form-group required"> | ||
| <label class="col-sm-2 control-label" for="eway-cardname"><?php echo $entry_cc_name; ?></label> | ||
| <div class="col-sm-10"> | ||
| <input name="EWAY_CARDNAME" type="text" value="" id="eway-cardname" placeholder="<?php echo $entry_cc_name; ?>" autocomplete="off" class="form-control"/> | ||
| <span id="ewaycard-error" class="text-danger"></span> | ||
| </div> | ||
| </div> | ||
| <div class="form-group required"> | ||
| <label class="col-sm-2 control-label" for="eway-cardnumber"><?php echo $entry_cc_number; ?></label> | ||
| <div class="col-sm-10"> | ||
| <input name="EWAY_CARDNUMBER" type="text" maxlength="19" id="eway-cardnumber" value="" placeholder="<?php echo $entry_cc_number; ?>" autocomplete="off" class="form-control" pattern="\d*" /> | ||
| <span id="ewaynumber-error" class="text-danger"></span> | ||
| </div> | ||
| </div> | ||
| <div class="form-group required"> | ||
| <label class="col-sm-2 control-label" for="eway-card-expiry-month"><?php echo $entry_cc_expire_date; ?></label> | ||
| <div class="col-sm-2"> | ||
| <select name="EWAY_CARDEXPIRYMONTH" id="eway-card-expiry-month" class="form-control"> | ||
| <?php foreach ($months as $month) { ?> | ||
| <option value="<?php echo $month['value']; ?>"><?php echo $month['text']; ?></option> | ||
| <?php } ?> | ||
| </select> | ||
| </div> | ||
| <div class="col-sm-2"> | ||
| <select name="EWAY_CARDEXPIRYYEAR" id="eway-card-expiry-year" class="form-control"> | ||
| <?php foreach ($year_expire as $year) { ?> | ||
| <option value="<?php echo $year['value']; ?>"><?php echo $year['text']; ?></option> | ||
| <?php } ?> | ||
| </select><div id="expiry-error" class="text-danger"></div> | ||
| </div> | ||
| </div> | ||
| <div class="form-group required"> | ||
| <label class="col-sm-2 control-label" for="eway-cardcvn"><?php echo $entry_cc_cvv2; ?></label> | ||
| <div class="col-sm-10"> | ||
| <input name="EWAY_CARDCVN" type="text" maxlength="4" value="" placeholder="<?php echo $entry_cc_cvv2; ?>" id="eway-cardcvn" autocomplete="off" class="form-control" pattern="\d*" /> | ||
| <span id="cvn-details" class="help"> | ||
| <?php echo $help_cvv; ?> | ||
| <?php if (in_array('amex', $payment_type)) { ?> | ||
| <br><?php echo $help_cvv_amex; ?> | ||
| <?php } ?> | ||
| </span> | ||
| <br> | ||
| <span id="ewaycvn-error" class="text-danger"></span> | ||
| </div> | ||
| </div> | ||
| </fieldset> | ||
| <?php } ?> | ||
| </form> | ||
| <div class="buttons"> | ||
| <div class="pull-right"> | ||
| <input type="button" value="<?php echo $button_confirm; ?>" id="button-confirm" data-loading-text="<?php echo $text_loading; ?>" class="btn btn-primary" /> | ||
| </div> | ||
| </div> | ||
| <script language="JavaScript" type="text/javascript" >//<!-- | ||
| function select_eWAYPaymentOption(v) { | ||
| if ($("#creditcard-info").length) { | ||
| $("#creditcard-info").hide(); | ||
| } | ||
| if ($("#tip-paypal").length) { | ||
| $("#tip-paypal").hide(); | ||
| } | ||
| if ($("#tip-masterpass").length) { | ||
| $("#tip-masterpass").hide(); | ||
| } | ||
| if ($("#tip-vme").length) { | ||
| $("#tip-vme").hide(); | ||
| } | ||
| if (v == 'creditcard') { | ||
| $("#creditcard-info").show(); | ||
| } else { | ||
| $("#tip-" + v).show(); | ||
| } | ||
| } | ||
| //--></script> | ||
| <script type="text/javascript"><!-- | ||
| $('#button-confirm').bind('click', function () { | ||
| <form action="<?php echo $action; ?>" method="POST" class="form-horizontal" id="eway-payment-form"> | ||
| <fieldset id="payment"> | ||
| <legend><?php echo $text_credit_card; ?></legend> | ||
| <input type="hidden" name="EWAY_ACCESSCODE" value="<?php echo $AccessCode; ?>" /> | ||
| <?php if ($sandbox) { ?> | ||
| <div class="alert alert-warning"><?php echo $text_testing; ?></div> | ||
| <?php } ?> | ||
| <div class="form-group"> | ||
| <div class="col-sm-12"> | ||
| <ul> | ||
| <?php if ($payment_type['visa'] == 1 || $payment_type['mastercard'] == 1 || $payment_type['diners'] == 1 || $payment_type['jcb'] == 1 || $payment_type['amex'] == 1) { ?> | ||
| <label><input type="radio" name="EWAY_PAYMENTTYPE" id="eway-radio-cc" value="creditcard" checked="checked" onchange="javascript:select_eWAYPaymentOption('creditcard')" /> | ||
| <?php if ($payment_type['visa'] == 1) { ?> | ||
| <img src="catalog/view/theme/default/image/eway_creditcard_visa.png" height="30" alt="Visa" /> | ||
| <?php } ?> | ||
| <?php if ($payment_type['mastercard'] == 1) { ?> | ||
| <img src="catalog/view/theme/default/image/eway_creditcard_master.png" height="30" alt="MasterCard" /> | ||
| <?php } ?> | ||
| <?php if ($payment_type['diners'] == 1) { ?> | ||
| <img src="catalog/view/theme/default/image/eway_creditcard_diners.png" height="30" alt="Diners Club" /> | ||
| <?php } ?> | ||
| <?php if ($payment_type['jcb'] == 1) { ?> | ||
| <img src="catalog/view/theme/default/image/eway_creditcard_jcb.png" height="30" alt="JCB" /> | ||
| <?php } ?> | ||
| <?php if ($payment_type['amex'] == 1) { ?> | ||
| <img src="catalog/view/theme/default/image/eway_creditcard_amex.png" height="30" alt="AMEX" /> | ||
| <?php } ?> | ||
| </label> | ||
| <?php } ?> | ||
| <?php if ($payment_type['paypal'] == 1) { ?> | ||
| <label><input type="radio" name="EWAY_PAYMENTTYPE" value="paypal" onchange="javascript:select_eWAYPaymentOption(paypal)" /> <img src="catalog/view/theme/default/image/eway_paypal.png" height="30" alt="'.$text_card_type_pp.'" /></label> '; | ||
| <?php } ?> | ||
| <?php if ($payment_type['masterpass'] == 1) { ?> | ||
| <label><input type="radio" name="EWAY_PAYMENTTYPE" value="masterpass" onchange="javascript:select_eWAYPaymentOption(masterpass)" /> <img src="catalog/view/theme/default/image/eway_masterpass.png" height="30" alt="'.$text_card_type_mp.'" /></label> '; | ||
| <?php } ?> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| <?php if ($payment_type['paypal'] == 1) { ?> | ||
| <p id="tip-paypal" style="display:none;"><?php echo $text_type_help; ?><?php echo $text_card_type_pp; ?></p> | ||
| <?php } ?> | ||
| <?php if ($payment_type['masterpass'] == 1) { ?> | ||
| <p id="tip-masterpass" style="display:none;"><?php echo $text_type_help; ?><?php echo $text_card_type_mp; ?></p> | ||
| <?php } ?> | ||
| <?php if ($payment_type['visa'] == 1 || $payment_type['mastercard'] == 1 || $payment_type['diners'] == 1 || $payment_type['jcb'] == 1 || $payment_type['amex'] == 1) { ?> | ||
| <div id="creditcard-info"> | ||
| <div class="form-group required"> | ||
| <label class="col-sm-2 control-label" for="eway-cardname"><?php echo $entry_cc_name; ?></label> | ||
| <div class="col-sm-10"> | ||
| <input name="EWAY_CARDNAME" type="text" value="" id="eway-cardname" placeholder="<?php echo $entry_cc_name; ?>" autocomplete="off" class="form-control"/> | ||
| <span id="ewaycard-error" class="text-danger"></span> | ||
| </div> | ||
| </div> | ||
| <div class="form-group required"> | ||
| <label class="col-sm-2 control-label" for="eway-cardnumber"><?php echo $entry_cc_number; ?></label> | ||
| <div class="col-sm-10"> | ||
| <input name="EWAY_CARDNUMBER" type="text" maxlength="19" id="eway-cardnumber" value="" placeholder="<?php echo $entry_cc_number; ?>" autocomplete="off" class="form-control" pattern="\d*" /> | ||
| <span id="ewaynumber-error" class="text-danger"></span> | ||
| </div> | ||
| </div> | ||
| <div class="form-group required"> | ||
| <label class="col-sm-2 control-label" for="eway-card-expiry-month"><?php echo $entry_cc_expire_date; ?></label> | ||
| <div class="col-sm-2"> | ||
| <select name="EWAY_CARDEXPIRYMONTH" id="eway-card-expiry-month" class="form-control"> | ||
| <?php foreach ($months as $month) { ?> | ||
| <option value="<?php echo $month['value']; ?>"><?php echo $month['text']; ?></option> | ||
| <?php } ?> | ||
| </select> | ||
| </div> | ||
| <div class="col-sm-2"> | ||
| <select name="EWAY_CARDEXPIRYYEAR" id="eway-card-expiry-year" class="form-control"> | ||
| <?php foreach ($year_expire as $year) { ?> | ||
| <option value="<?php echo $year['value']; ?>"><?php echo $year['text']; ?></option> | ||
| <?php } ?> | ||
| </select><div id="expiry-error" class="text-danger"></div> | ||
| </div> | ||
| </div> | ||
| <div class="form-group required"> | ||
| <label class="col-sm-2 control-label" for="eway-cardcvn"><?php echo $entry_cc_cvv2; ?></label> | ||
| <div class="col-sm-10"> | ||
| <input name="EWAY_CARDCVN" type="text" maxlength="4" value="" placeholder="<?php echo $entry_cc_cvv2; ?>" id="eway-cardcvn" autocomplete="off" class="form-control" pattern="\d*" /> | ||
| <span id="cvn-details" class="help"> | ||
| <?php echo $help_cvv; ?> | ||
| <?php if (in_array('amex', $payment_type)) { ?> | ||
| <br><?php echo $help_cvv_amex; ?> | ||
| <?php } ?> | ||
| </span> | ||
| <br> | ||
| <span id="ewaycvn-error" class="text-danger"></span> | ||
| </div> | ||
| </div> | ||
| </fieldset> | ||
| <?php } ?> | ||
| </form> | ||
| <div class="buttons"> | ||
| <div class="pull-right"> | ||
| <input type="button" value="<?php echo $button_confirm; ?>" id="button-confirm" data-loading-text="<?php echo $text_loading; ?>" class="btn btn-primary" /> | ||
| </div> | ||
| </div> | ||
| <script language="JavaScript" type="text/javascript" >//<!-- | ||
| function select_eWAYPaymentOption(v) { | ||
| if ($("#creditcard-info").length) { | ||
| $("#creditcard-info").hide(); | ||
| } | ||
| if ($("#tip-paypal").length) { | ||
| $("#tip-paypal").hide(); | ||
| } | ||
| if ($("#tip-masterpass").length) { | ||
| $("#tip-masterpass").hide(); | ||
| } | ||
| if ($("#tip-vme").length) { | ||
| $("#tip-vme").hide(); | ||
| } | ||
| if (v == 'creditcard') { | ||
| $("#creditcard-info").show(); | ||
| } else { | ||
| $("#tip-" + v).show(); | ||
| } | ||
| } | ||
| //--></script> | ||
| <script type="text/javascript"><!-- | ||
| $('#button-confirm').bind('click', function () { | ||
| if ($('#eway-radio-cc').is(':checked')) { | ||
| var eway_error = false; | ||
| if ($('#eway-cardname').val().length < 1) { | ||
| eway_error = true; | ||
| $('#ewaycard-error').html('Card Holder\'s Name must be entered'); | ||
| } else { | ||
| $('#ewaycard-error').empty(); | ||
| } | ||
| if ($('#eway-radio-cc').is(':checked')) { | ||
| var eway_error = false; | ||
| if ($('#eway-cardname').val().length < 1) { | ||
| eway_error = true; | ||
| $('#ewaycard-error').html('Card Holder\'s Name must be entered'); | ||
| } else { | ||
| $('#ewaycard-error').empty(); | ||
| } | ||
| var ccnum_regex = new RegExp("^[0-9]{13,19}$"); | ||
| if (!ccnum_regex.test($('#eway-cardnumber').val().replace(/ /g, '')) || !luhn10($('#eway-cardnumber').val())) { | ||
| eway_error = true; | ||
| $('#ewaynumber-error').html('Card Number appears invalid'); | ||
| } else { | ||
| $('#ewaynumber-error').empty(); | ||
| } | ||
| var ccnum_regex = new RegExp("^[0-9]{13,19}$"); | ||
| if (!ccnum_regex.test($('#eway-cardnumber').val().replace(/ /g, '')) || !luhn10($('#eway-cardnumber').val())) { | ||
| eway_error = true; | ||
| $('#ewaynumber-error').html('Card Number appears invalid'); | ||
| } else { | ||
| $('#ewaynumber-error').empty(); | ||
| } | ||
| var cc_year = parseInt($('#eway-card-expiry-year').val(), 10); | ||
| var cc_month = parseInt($('#eway-card-expiry-month').val(), 10); | ||
| var cc_year = parseInt($('#eway-card-expiry-year').val(), 10); | ||
| var cc_month = parseInt($('#eway-card-expiry-month').val(), 10); | ||
| var cc_expiry = new Date(cc_year, cc_month, 1); | ||
| var cc_expired = new Date(cc_expiry - 1); | ||
| var today = new Date(); | ||
| var cc_expiry = new Date(cc_year, cc_month, 1); | ||
| var cc_expired = new Date(cc_expiry - 1); | ||
| var today = new Date(); | ||
| if (today.getTime() > cc_expired.getTime()) { | ||
| eway_error = true; | ||
| $('#expiry-error').html('This expiry date has passed'); | ||
| } else { | ||
| $('#expiry-error').empty(); | ||
| } | ||
| if (today.getTime() > cc_expired.getTime()) { | ||
| eway_error = true; | ||
| $('#expiry-error').html('This expiry date has passed'); | ||
| } else { | ||
| $('#expiry-error').empty(); | ||
| } | ||
| var ccv_regex = new RegExp("^[0-9]{3,4}$"); | ||
| if (!ccv_regex.test($('#eway-cardcvn').val().replace(/ /g, ''))) { | ||
| eway_error = true; | ||
| $('#ewaycvn-error').html('CVV/CSV Number appears invalid'); | ||
| } else { | ||
| $('#ewaycvn-error').empty(); | ||
| } | ||
| var ccv_regex = new RegExp("^[0-9]{3,4}$"); | ||
| if (!ccv_regex.test($('#eway-cardcvn').val().replace(/ /g, ''))) { | ||
| eway_error = true; | ||
| $('#ewaycvn-error').html('CVV/CSV Number appears invalid'); | ||
| } else { | ||
| $('#ewaycvn-error').empty(); | ||
| } | ||
| if (eway_error) { | ||
| return false; | ||
| } | ||
| } | ||
| if (eway_error) { | ||
| return false; | ||
| } | ||
| } | ||
| $('#eway-payment-form').submit(); | ||
| $('#button-confirm').button('loading'); | ||
| $("#button-confirm").prop('disabled', true); | ||
| $('#eway-payment-form').submit(); | ||
| $('#button-confirm').button('loading'); | ||
| $("#button-confirm").prop('disabled', true); | ||
| }); | ||
| }); | ||
| var luhn10 = function (a, b, c, d, e) { | ||
| for (d = +a[b = a.length - 1], e = 0; b--; ) { | ||
| c = +a[b], d += ++e % 2 ? 2 * c % 10 + (c > 4) : c; | ||
| } | ||
| return !(d % 10) | ||
| }; | ||
| var luhn10 = function (a, b, c, d, e) { | ||
| for (d = +a[b = a.length - 1], e = 0; b--; ) { | ||
| c = +a[b], d += ++e % 2 ? 2 * c % 10 + (c > 4) : c; | ||
| } | ||
| return !(d % 10) | ||
| }; | ||
| //--></script> | ||
| //--></script> | ||
| <?php } ?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters