Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@snehalpatil0904
snehalpatil0904 committed Oct 27, 2015
2 parents 3640507 + 514138b commit 9cbf647
Show file tree
Hide file tree
Showing 23 changed files with 104 additions and 113 deletions.
4 changes: 2 additions & 2 deletions 2checkout/2checkout/tmpl/default.php
View file
Expand Up @@ -4,9 +4,9 @@
* @license GNU General Public License version 2, or later
*/
defined('_JEXEC') or die('Restricted access');
?>

?>
<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->action_url ?>" method="post" id="paymentForm">
<div>
<input type="hidden" name="sid" value="<?php echo $vars->sid?>" />
Expand Down
4 changes: 1 addition & 3 deletions 2checkout/2checkout/tmpl/form.php
View file
Expand Up @@ -6,9 +6,7 @@
defined('_JEXEC') or die('Restricted access');

?>

<!--@TODO - Remove this layout from the plugin not used any where refer Task #56754-->
<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->action_url ?>" class="form-horizontal" method="post" id="paymentForm">

<input type="hidden" name="sid" value="<?php echo $vars->sid?>" />
Expand Down
2 changes: 1 addition & 1 deletion alphauserpoints/alphauserpoints/tmpl/form.php
View file
Expand Up @@ -36,7 +36,7 @@ function calculate(convert_val,count,user_points,not_enough_pts_message,success_
}

</script>
<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->url ?>" class="form-validate form-horizontal" method="post" id="paymentForm" name="paymentForm">
<div>
<div class="controls">
Expand Down
2 changes: 1 addition & 1 deletion authorizenet/authorizenet/tmpl/default.php
View file
Expand Up @@ -63,7 +63,7 @@ function plg_auth_showHide()
}
</script>

<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->url; /* $vars->submiturl; // rollded back */ ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal" method="post">
<div>
<?php
Expand Down
54 changes: 27 additions & 27 deletions authorizenet/authorizenet/tmpl/default_bs3.php
View file
Expand Up @@ -60,7 +60,7 @@ function plg_auth_showHide()
}

</script>
<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->url; //$vars->submiturl; // rollded back ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal" method="post">
<div>
<?php
Expand All @@ -78,47 +78,47 @@ function plg_auth_showHide()
} ?>
<div id="tj_payGway_billInfo" style="display:<?php echo $plg_billStyle; ?>">
<div class="form-group">
<label for="cardfname" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'FIRST_NAME' ) ?></label>
<div class="controls"><input class="inputbox required" id="cardfname" type="text" name="cardfname" size="35" value="<?php echo !empty($userInfo['firstname']) ?$userInfo['firstname']:'' ;?>" /></div>
<label for="cardfname" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'FIRST_NAME' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="cardfname" type="text" name="cardfname" size="35" value="<?php echo !empty($userInfo['firstname']) ?$userInfo['firstname']:'' ;?>" /></div>
</div>
<div class="form-group">
<label for="cardlname" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'LAST_NAME' ) ?></label>
<div class="controls"><input class="inputbox required" id="cardlname" type="text" name="cardlname" size="35" value="<?php echo !empty($userInfo['lastname']) ?$userInfo['lastname']:'' ;?>" /></div>
<label for="cardlname" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'LAST_NAME' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="cardlname" type="text" name="cardlname" size="35" value="<?php echo !empty($userInfo['lastname']) ?$userInfo['lastname']:'' ;?>" /></div>
</div>
<div class="form-group">
<label for="cardaddress1" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'STREET_ADDRESS' ) ?></label>
<div class="controls"><input class="inputbox required" id="cardaddress1" type="text" name="cardaddress1" size="" value="<?php echo !empty($userInfo['add_line1']) ?$userInfo['add_line1']:'' ;?>" /></div>
<label for="cardaddress1" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'STREET_ADDRESS' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="cardaddress1" type="text" name="cardaddress1" size="" value="<?php echo !empty($userInfo['add_line1']) ?$userInfo['add_line1']:'' ;?>" /></div>
</div>
<div class="form-group">
<label for="cardaddress2" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'STREET_ADDRESS_CONTINUED' ) ?></label>
<div class="controls"><input class="inputbox" id="cardaddress2" type="text" name="cardaddress2" size="45" value="<?php echo !empty($userInfo['add_line2']) ?$userInfo['add_line2']:'' ;?>" /></div>
<label for="cardaddress2" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'STREET_ADDRESS_CONTINUED' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox" id="cardaddress2" type="text" name="cardaddress2" size="45" value="<?php echo !empty($userInfo['add_line2']) ?$userInfo['add_line2']:'' ;?>" /></div>
</div>
<div class="form-group">
<label for="cardcity" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CITY' ) ?></label>
<div class="controls"><input class="inputbox required" id="cardcity" type="text" name="cardcity" size="35" value="<?php echo !empty($userInfo['city']) ?$userInfo['city']:'' ;?>" /></div>
<label for="cardcity" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CITY' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="cardcity" type="text" name="cardcity" size="35" value="<?php echo !empty($userInfo['city']) ?$userInfo['city']:'' ;?>" /></div>
</div>
<div class="form-group">
<label for="cardstate" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'STATE' ) ?></label>
<div class="controls"><input class="inputbox required" id="cardstate" type="text" name="cardstate" size="10" value="<?php echo !empty($userInfo['state_code']) ?$userInfo['state_code']:'' ;?>" /></div>
<label for="cardstate" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'STATE' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="cardstate" type="text" name="cardstate" size="10" value="<?php echo !empty($userInfo['state_code']) ?$userInfo['state_code']:'' ;?>" /></div>
</div>
<div class="form-group">
<label for="cardzip" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'POSTAL_CODE' ) ?></label>
<div class="controls"><input class="inputbox required" id="cardzip" type="text" name="cardzip" size="10" value="<?php echo !empty($userInfo['zipcode']) ?$userInfo['zipcode']:'' ;?>" /></div>
<label for="cardzip" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'POSTAL_CODE' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="cardzip" type="text" name="cardzip" size="10" value="<?php echo !empty($userInfo['zipcode']) ?$userInfo['zipcode']:'' ;?>" /></div>
</div>
<div class="form-group">
<label for="cardcountry" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'COUNTRY' ) ?></label>
<div class="controls"><input class="inputbox required" id="cardcountry" type="text" name="cardcountry" size="35" value="<?php echo !empty($userInfo['country_code']) ?$userInfo['country_code']:'' ;?>" /></div>
<label for="cardcountry" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'COUNTRY' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="cardcountry" type="text" name="cardcountry" size="35" value="<?php echo !empty($userInfo['country_code']) ?$userInfo['country_code']:'' ;?>" /></div>
</div>
<div class="form-group">
<label for="email" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'EMAIL_ADDRESS' ) ?></label>
<div class="controls"><input class="inputbox required" id="email" type="text" name="email" size="35" value="<?php echo $vars->user_email;?>" /></div>
<label for="email" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'EMAIL_ADDRESS' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="email" type="text" name="email" size="35" value="<?php echo $vars->user_email;?>" /></div>
</div>
</div>
<!-- end of bill info-->
<hr/>
<div class="form-group">
<label for="" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CREDIT_CARD_TYPE' ) ?></label>
<div class="controls"><?php
<label for="" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CREDIT_CARD_TYPE' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><?php
$types = array();
$credit_cards=$this->params->get( 'credit_cards', '' );
$creditcardarray=array(JText::_( "VISA" )=>'Visa', JText::_( "MASTERCARD" )=>'Mastercard',JText::_( "AMERICAN_EXPRESS" )=>'AmericanExpress',
Expand Down Expand Up @@ -154,16 +154,16 @@ function plg_auth_showHide()
</div>
</div>
<div class="form-group">
<label for="cardnum" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CARD_NUMBER' ) ?></label>
<div class="controls"><input class="inputbox required" id="cardnum" type="text" name="cardnum" size="35" value="" /></div>
<label for="cardnum" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CARD_NUMBER' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="cardnum" type="text" name="cardnum" size="35" value="" /></div>
</div>
<div class="form-group">
<label for="cardexp" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'EXPIRATION_DATE_IN_FORMAT_MMYY' ) ?></label>
<div class="controls"><input class="inputbox required" id="cardexp" type="text" name="cardexp" size="10" value="" /></div>
<label for="cardexp" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'EXPIRATION_DATE_IN_FORMAT_MMYY' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="cardexp" type="text" name="cardexp" size="10" value="" /></div>
</div>
<div class="form-group">
<label for="cardcvv" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CARD_CVV_NUMBER' ) ?></label>
<div class="controls"><input class="inputbox required" id="cardcvv" type="text" name="cardcvv" size="10" value="" /></div>
<label for="cardcvv" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CARD_CVV_NUMBER' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><input class="inputbox required" id="cardcvv" type="text" name="cardcvv" size="10" value="" /></div>
</div>
<div class="form-actions">
<input type="hidden" name="amount" size="10" value="<?php echo $vars->amount;?>" />
Expand Down
2 changes: 1 addition & 1 deletion blank/blank/tmpl/default.php
View file
Expand Up @@ -31,7 +31,7 @@ function myValidate(f)


</script>
<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->action_url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal" method="post">
<div>
<div class="control-group">
Expand Down
20 changes: 11 additions & 9 deletions bycheck/bycheck/tmpl/default.php
View file
Expand Up @@ -35,15 +35,17 @@ function myValidate(f)
return false;
}
</script>
<div class="akeeba-bootstrap">
<form action="<?php echo $vars->url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);"
class="form-validate form-horizontal" method="post">
<div>
<div class="control-group">
<label for="cardfname" class="control-label"><?php echo JText::_('PLG_CHEQUE_ORDER_INFO');?></label>
<div class="controls">
<?php echo JText::sprintf('ORDER_INFO', $vars->custom_name);?>
</div>
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal" method="post">
<div>
<div class="control-group">
<label for="cardfname" class="control-label"><?php echo JText::_( 'PLG_CHEQUE_ORDER_INFO' );?></label>
<div class="controls"> <?php echo JText::sprintf( 'ORDER_INFO', $vars->custom_name);?></div>
</div>
<div class="control-group">
<label for="cardlname" class="control-label"><?php echo JText::_( 'COMMENT' ); ?></label>
<div class="controls">
<textarea id='comment' name='comment' class="inputbox" rows='3' maxlength='135' size='28'><?php if(isset($vars->comment)){ echo $vars->comment; } ?></textarea>
</div>
<div class="control-group">
<label for="cardlname" class="control-label"><?php echo JText::_('COMMENT'); ?></label>
Expand Down
46 changes: 17 additions & 29 deletions bycheck/bycheck/tmpl/default_bs3.php
View file
Expand Up @@ -34,36 +34,24 @@ function myValidate(f)
return false;
}
</script>
<div class="akeeba-bootstrap">
<form action="<?php echo $vars->url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);"
class="form-validate form-horizontal" method="post">
<div>
<div class="form-group">
<label for="cardfname" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label">
<?php echo JText::_('PLG_CHEQUE_ORDER_INFO');?>
</label>
<div class="col-lg-10 col-md-10 col-sm-9 col-xs-12">
<?php echo JText::sprintf('ORDER_INFO', $vars->custom_name);?>
</div>
</div>
<div class="form-group">
<label for="cardlname" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_('COMMENT'); ?></label>
<div class="col-lg-10 col-md-10 col-sm-9 col-xs-12">
<textarea id='comment' name='comment' class="inputbox" rows='3' maxlength='135' size='28'>
<?php
if (isset($vars->comment))
{
echo $vars->comment;
}?>
</textarea>
</div>
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal" method="post">
<div>
<div class="form-group">
<label for="cardfname" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'PLG_CHEQUE_ORDER_INFO' );?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"> <?php echo JText::sprintf( 'ORDER_INFO', $vars->custom_name);?></div>
</div>
<div class="form-group">
<label for="cardlname" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'COMMENT' ); ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">

<textarea id='comment' name='comment' class="inputbox" rows='3' maxlength='135' size='28'><?php if(isset($vars->comment)){ echo $vars->comment; } ?></textarea>

</div>
<div class="form-group">
<label for="cardaddress1" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label">
<?php echo JText::_('CON_PAY_PRO') ?>
</label>
<div class="col-lg-10 col-md-10 col-sm-9 col-xs-12">
<?php echo $email;?>
</div>
<div class="form-group">
<label for="cardaddress1" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CON_PAY_PRO' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><?php echo $email;?>
<input type='hidden' name='mail_addr' value="<?php echo $email;?>" />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion byorder/byorder/tmpl/default.php
View file
Expand Up @@ -38,7 +38,7 @@ function myValidate(f)


</script>
<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal" method="post">
<div>
<div class="control-group">
Expand Down
14 changes: 7 additions & 7 deletions byorder/byorder/tmpl/default_bs3.php
View file
Expand Up @@ -38,22 +38,22 @@ function myValidate(f)


</script>
<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal" method="post">
<div>
<div class="form-group">
<label for="cardfname" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'PLG_BYORDER_INFO' );?></label>
<div class="col-lg-10 col-md-10 col-sm-9 col-xs-12"> <?php echo JText::sprintf( 'ORDER_INFO', $vars->custom_name);?></div>
<label for="cardfname" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'PLG_BYORDER_INFO' );?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"> <?php echo JText::sprintf( 'ORDER_INFO', $vars->custom_name);?></div>
</div>
<div class="form-group">
<label for="cardlname" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'COMMENT' ); ?></label>
<div class="col-lg-10 col-md-10 col-sm-9 col-xs-12">
<label for="cardlname" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'COMMENT' ); ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">
<textarea id='comment' name='comment' class="inputbox" rows='3' maxlength='135' size='28'><?php if(isset($vars->comment)){ echo $vars->comment; } ?></textarea>
</div>
</div>
<div class="form-group">
<label for="cardaddress1" class="col-lg-2 col-md-2 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CON_PAY_PRO' ) ?></label>
<div class="col-lg-10 col-md-10 col-sm-9 col-xs-12"><?php echo $email;?>
<label for="cardaddress1" class="col-lg-3 col-md-3 col-sm-3 col-xs-12 control-label"><?php echo JText::_( 'CON_PAY_PRO' ) ?></label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12"><?php echo $email;?>
<input type='hidden' name='mail_addr' value="<?php echo $email;?>" />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion cod/cod/tmpl/default.php
View file
Expand Up @@ -29,7 +29,7 @@ function myValidate(f)
}

</script>
<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->url; ?>" name="adminForm" id="adminForm" onSubmit="return myValidate(this);" class="form-validate form-horizontal" method="post">
<div>
<!--
Expand Down
2 changes: 1 addition & 1 deletion easysocialpoints/easysocialpoints/tmpl/form.php
View file
Expand Up @@ -37,7 +37,7 @@ function calculate(convert_val,count,user_points,not_enough_pts_message,success_



<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->url ?>" class="form-validate form-horizontal" method="post" id="paymentForm" name="paymentForm">
<div>
<div>
Expand Down
2 changes: 1 addition & 1 deletion jomsocialpoints/jomsocialpoints/tmpl/form.php
View file
Expand Up @@ -37,7 +37,7 @@ function calculate(convert_val,count,user_points,not_enough_pts_message,success_



<div class="akeeba-bootstrap">
<div class="tjcpg-wrapper">
<form action="<?php echo $vars->url ?>" class="form-validate form-horizontal" method="post" id="paymentForm" name="paymentForm">
<div>
<div>
Expand Down

0 comments on commit 9cbf647

Please sign in to comment.