[TEP-COMMIT] CVS: catalog/catalog checkout_confirmation.php,1.140,1.141 checkout_payment.php,1.114,1.115 conditions.php,1.23,1.24 contact_us.php,1.43,1.44
Mark Evans <[email protected]>
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tep/catalog/catalog
In directory sc8-pr-cvs1:/tmp/cvs-serv12041
Modified Files:
checkout_confirmation.php checkout_payment.php conditions.php
contact_us.php
Log Message:
European Regulations work. This is detailed in workboard item 69
Index: checkout_confirmation.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/checkout_confirmation.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- checkout_confirmation.php 17 Nov 2003 20:58:34 -0000 1.140
+++ checkout_confirmation.php 3 Dec 2003 17:32:52 -0000 1.141
@@ -45,6 +45,14 @@
$osC_Session->set('comments', tep_db_prepare_input($_POST['comments']));
}
+ if (DISPLAY_CONDITIONS_ON_CHECKOUT == 'true') {
+ if (!isset($_POST['conditions']) || ($_POST['conditions'] != '1')) {
+ $messageStack->add_session('checkout_conditions', ERROR_CONDITIONS_NOT_ACCEPTED, 'error');
+
+ tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
+ }
+ }
+
// load the selected payment module
require(DIR_WS_CLASSES . 'payment.php');
$payment_modules = new payment($osC_Session->value('payment'));
Index: checkout_payment.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/checkout_payment.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- checkout_payment.php 17 Nov 2003 20:58:34 -0000 1.114
+++ checkout_payment.php 3 Dec 2003 17:32:53 -0000 1.115
@@ -115,6 +115,11 @@
function rowOutEffect(object) {
if (object.className == 'moduleRowOver') object.className = 'moduleRow';
}
+
+function changeSelection(selection) {
+ box = eval(selection);
+ box.checked = !box.checked;
+}
//--></script>
<?php echo $payment_modules->javascript_validation(); ?>
</head>
@@ -162,6 +167,44 @@
<td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
<td class="main" width="100%" valign="top"><?php echo tep_output_string_protected($error['error']); ?></td>
<td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
+ </tr>
+ </table></td>
+ </tr>
+ </table></td>
+ </tr>
+ <tr>
+ <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
+ </tr>
+<?php
+ }
+
+ if (DISPLAY_CONDITIONS_ON_CHECKOUT == 'true') {
+ if ($messageStack->size('checkout_conditions') > 0) {
+?>
+ <tr>
+ <td><?php echo $messageStack->output('checkout_conditions'); ?></td>
+ </tr>
+ <tr>
+ <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
+ </tr>
+<?php
+ }
+?>
+ <tr>
+ <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="main"><b><?php echo TABLE_HEADING_CONDITIONS; ?></b></td>
+ </tr>
+ </table></td>
+ </tr>
+ <tr>
+ <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
+ <tr class="infoBoxContents">
+ <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
+ <td class="main"><?php echo TEXT_CONDITIONS_DESCRIPTION . '<br><br>' . tep_draw_checkbox_field('conditions', '1') . ' <span onClick="changeSelection(document.checkout_payment.conditions)">' . TEXT_CONDITIONS_CONFIRM . '</span>'; ?></td>
+ <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
</tr>
</table></td>
</tr>
Index: conditions.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/conditions.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- conditions.php 17 Nov 2003 21:00:43 -0000 1.23
+++ conditions.php 3 Dec 2003 17:32:53 -0000 1.24
@@ -56,6 +56,27 @@
<tr>
<td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
</tr>
+<?php
+ if (isset($navigation->path[sizeof($navigation->path)-2]) && ($navigation->path[sizeof($navigation->path)-2]['page'] == FILENAME_CHECKOUT_PAYMENT)) {
+?>
+ <tr>
+ <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
+ <tr class="infoBoxContents">
+ <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
+ <td class="main"><?php echo '<b>' . TITLE_CONTINUE_CHECKOUT_PROCEDURE . '</b><br>' . TEXT_CONTINUE_CHECKOUT_PROCEDURE; ?></td>
+ <td align="right"><?php echo '<a href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT) . '">' . tep_image_button('button_continue.gif', IMAGE_BUTTON_CONTINUE) . '</a>'; ?></td>
+ <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
+ </tr>
+ </table></td>
+ </tr>
+ </table></td>
+ </tr>
+ </table></td>
+<?php
+ } else {
+?>
<tr>
<td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
<tr class="infoBoxContents">
@@ -70,6 +91,9 @@
</table></td>
</tr>
</table></td>
+<?php
+ }
+?>
<!-- body_text_eof //-->
<td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
<!-- right_navigation //-->
Index: contact_us.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/contact_us.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- contact_us.php 17 Nov 2003 21:00:43 -0000 1.43
+++ contact_us.php 3 Dec 2003 17:32:53 -0000 1.44
@@ -108,6 +108,23 @@
<tr class="infoBoxContents">
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
+ <td class="main"><?php echo nl2br(STORE_NAME_ADDRESS); ?></td>
+ </tr>
+ <tr>
+ <td class="main"><?php echo nl2br(STORE_OWNER_EMAIL_ADDRESS); ?></td>
+ </tr>
+ </table></td>
+ </tr>
+ </table></td>
+ </tr>
+ <tr>
+ <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
+ </tr>
+ <tr>
+ <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
+ <tr class="infoBoxContents">
+ <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
<td class="main"><?php echo ENTRY_NAME; ?></td>
</tr>
<tr>
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/