Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Support nested Actions (Admin/TaxClasses Application)

  • Loading branch information...
commit f2de786f184f3e7dc0773f9740203080c5844045 1 parent de5a80c
@haraldpdl haraldpdl authored committed
Showing with 226 additions and 130 deletions.
  1. +0 −22 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/BatchDelete.php
  2. +38 −0 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/BatchDelete/Process.php
  3. +0 −22 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/BatchDeleteEntries.php
  4. +38 −0 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/BatchDeleteEntries/Process.php
  5. +0 −13 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/Delete.php
  6. +29 −0 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/Delete/Process.php
  7. +0 −13 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/EntryDelete.php
  8. +29 −0 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/EntryDelete/Process.php
  9. +0 −20 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/EntrySave.php
  10. +36 −0 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/EntrySave/Process.php
  11. +0 −16 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/Save.php
  12. +32 −0 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/Save/Process.php
  13. +2 −2 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/batch_delete.php
  14. +2 −2 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/delete.php
  15. +2 −2 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/edit.php
  16. +4 −4 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries.php
  17. +2 −2 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries_batch_delete.php
  18. +2 −2 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries_delete.php
  19. +2 −2 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries_edit.php
  20. +2 −2 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries_new.php
  21. +4 −4 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/main.php
  22. +2 −2 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/new.php
View
22 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/BatchDelete.php
@@ -11,33 +11,11 @@
namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class BatchDelete {
public static function execute(ApplicationAbstract $application) {
if ( isset($_POST['batch']) && is_array($_POST['batch']) && !empty($_POST['batch']) ) {
$application->setPageContent('batch_delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $error = false;
-
- foreach ( $_POST['batch'] as $id ) {
- if ( !TaxClasses::delete($id) ) {
- $error = true;
- break;
- }
- }
-
- if ( $error === false ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink());
- }
}
}
}
View
38 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/BatchDelete/Process.php
@@ -0,0 +1,38 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action\BatchDelete;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ $error = false;
+
+ foreach ( $_POST['batch'] as $id ) {
+ if ( !TaxClasses::delete($id) ) {
+ $error = true;
+ break;
+ }
+ }
+
+ if ( $error === false ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink());
+ }
+ }
+?>
View
22 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/BatchDeleteEntries.php
@@ -11,33 +11,11 @@
namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class BatchDeleteEntries {
public static function execute(ApplicationAbstract $application) {
if ( isset($_POST['batch']) && is_array($_POST['batch']) && !empty($_POST['batch']) ) {
$application->setPageContent('entries_batch_delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $error = false;
-
- foreach ( $_POST['batch'] as $id ) {
- if ( !TaxClasses::deleteEntry($id) ) {
- $error = true;
- break;
- }
- }
-
- if ( $error === false ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
- }
}
}
}
View
38 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/BatchDeleteEntries/Process.php
@@ -0,0 +1,38 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action\BatchDeleteEntries;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ $error = false;
+
+ foreach ( $_POST['batch'] as $id ) {
+ if ( !TaxClasses::deleteEntry($id) ) {
+ $error = true;
+ break;
+ }
+ }
+
+ if ( $error === false ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
+ }
+ }
+?>
View
13 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/Delete.php
@@ -11,23 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class Delete {
public static function execute(ApplicationAbstract $application) {
$application->setPageContent('delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- if ( TaxClasses::delete($_GET['id']) ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink());
- }
}
}
?>
View
29 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/Delete/Process.php
@@ -0,0 +1,29 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action\Delete;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ if ( TaxClasses::delete($_GET['id']) ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink());
+ }
+ }
+?>
View
13 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/EntryDelete.php
@@ -11,23 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class EntryDelete {
public static function execute(ApplicationAbstract $application) {
$application->setPageContent('entries_delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- if ( TaxClasses::deleteEntry($_GET['rID']) ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
- }
}
}
?>
View
29 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/EntryDelete/Process.php
@@ -0,0 +1,29 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action\EntryDelete;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ if ( TaxClasses::deleteEntry($_GET['rID']) ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
+ }
+ }
+?>
View
20 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/EntrySave.php
@@ -11,9 +11,6 @@
namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class EntrySave {
public static function execute(ApplicationAbstract $application) {
@@ -22,23 +19,6 @@ public static function execute(ApplicationAbstract $application) {
} else {
$application->setPageContent('entries_new.php');
}
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $data = array('zone_id' => $_POST['tax_zone_id'],
- 'rate' => $_POST['tax_rate'],
- 'description' => $_POST['tax_description'],
- 'priority' => $_POST['tax_priority'],
- 'rate' => $_POST['tax_rate'],
- 'tax_class_id' => $_GET['id']);
-
- if ( TaxClasses::saveEntry((isset($_GET['rID']) && is_numeric($_GET['rID']) ? $_GET['rID'] : null), $data) ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
- }
}
}
?>
View
36 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/EntrySave/Process.php
@@ -0,0 +1,36 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action\EntrySave;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ $data = array('zone_id' => $_POST['tax_zone_id'],
+ 'rate' => $_POST['tax_rate'],
+ 'description' => $_POST['tax_description'],
+ 'priority' => $_POST['tax_priority'],
+ 'rate' => $_POST['tax_rate'],
+ 'tax_class_id' => $_GET['id']);
+
+ if ( TaxClasses::saveEntry((isset($_GET['rID']) && is_numeric($_GET['rID']) ? $_GET['rID'] : null), $data) ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
+ }
+ }
+?>
View
16 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/Save.php
@@ -11,9 +11,6 @@
namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class Save {
public static function execute(ApplicationAbstract $application) {
@@ -22,19 +19,6 @@ public static function execute(ApplicationAbstract $application) {
} else {
$application->setPageContent('new.php');
}
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $data = array('title' => $_POST['tax_class_title'],
- 'description' => $_POST['tax_class_description']);
-
- if ( TaxClasses::save((isset($_GET['id']) && is_numeric($_GET['id']) ? $_GET['id'] : null), $data) ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink());
- }
}
}
?>
View
32 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/Action/Save/Process.php
@@ -0,0 +1,32 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\TaxClasses\Action\Save;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\TaxClasses\TaxClasses;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ $data = array('title' => $_POST['tax_class_title'],
+ 'description' => $_POST['tax_class_description']);
+
+ if ( TaxClasses::save((isset($_GET['id']) && is_numeric($_GET['id']) ? $_GET['id'] : null), $data) ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink());
+ }
+ }
+?>
View
4 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/batch_delete.php
@@ -23,7 +23,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . OSCOM::getDef('action_heading_batch_delete_tax_classes'); ?></h3>
- <form name="tcDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'action=BatchDelete'); ?>" method="post">
+ <form name="tcDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'BatchDelete&Process'); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_batch_delete_tax_classes'); ?></p>
@@ -45,7 +45,7 @@
}
if ( !empty($names_string) ) {
- $names_string = substr($names_string, 0, -2) . osc_draw_hidden_field('subaction', 'confirm');
+ $names_string = substr($names_string, 0, -2);
}
echo '<p>' . $names_string . '</p>';
View
4 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/delete.php
@@ -26,7 +26,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . $OSCOM_ObjectInfo->getProtected('tax_class_title'); ?></h3>
- <form name="tcDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $OSCOM_ObjectInfo->getInt('tax_class_id') . '&action=Delete'); ?>" method="post">
+ <form name="tcDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'Delete&Process&id=' . $OSCOM_ObjectInfo->getInt('tax_class_id')); ?>" method="post">
<?php
if ( TaxClasses::hasProducts($OSCOM_ObjectInfo->getInt('tax_class_id')) ) {
@@ -44,7 +44,7 @@
<p><?php echo '<b>' . $OSCOM_ObjectInfo->get('tax_class_title') . ' (' . sprintf(OSCOM::getDef('total_entries'), $OSCOM_ObjectInfo->getInt('total_tax_rates')) . ')</b>'; ?></p>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'trash', 'title' => OSCOM::getDef('button_delete'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'trash', 'title' => OSCOM::getDef('button_delete'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
<?php
}
View
4 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/edit.php
@@ -26,7 +26,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('edit.png') . ' ' . $OSCOM_ObjectInfo->getProtected('tax_class_title'); ?></h3>
- <form name="tcEdit" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $OSCOM_ObjectInfo->getInt('tax_class_id') . '&action=Save'); ?>" method="post">
+ <form name="tcEdit" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'Save&Process&id=' . $OSCOM_ObjectInfo->getInt('tax_class_id')); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_edit_tax_class'); ?></p>
@@ -35,7 +35,7 @@
<p><label for="tax_class_description"><?php echo OSCOM::getDef('field_description'); ?></label><?php echo osc_draw_input_field('tax_class_description', $OSCOM_ObjectInfo->get('tax_class_description')); ?></p>
</fieldset>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
8 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries.php
@@ -22,7 +22,7 @@
<form id="liveSearchForm">
<input type="text" id="liveSearchField" name="search" class="searchField fieldTitleAsDefault" title="Search.." /><?php echo osc_draw_button(array('type' => 'button', 'params' => 'onclick="osC_DataTable.reset();"', 'title' => 'Reset')); ?>
- <span style="float: right;"><?php echo osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'triangle-1-w', 'title' => OSCOM::getDef('button_back'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=EntrySave'), 'icon' => 'plus', 'title' => OSCOM::getDef('button_insert'))); ?></span>
+ <span style="float: right;"><?php echo osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'triangle-1-w', 'title' => OSCOM::getDef('button_back'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'EntrySave&id=' . $_GET['id']), 'icon' => 'plus', 'title' => OSCOM::getDef('button_insert'))); ?></span>
</form>
<div style="padding: 20px 5px 5px 5px; height: 16px;">
@@ -44,7 +44,7 @@
</thead>
<tfoot>
<tr>
- <th align="right" colspan="4"><?php echo '<input type="image" src="' . osc_icon_raw('trash.png') . '" title="' . OSCOM::getDef('icon_trash') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=BatchDeleteEntries') . '\';" />'; ?></th>
+ <th align="right" colspan="4"><?php echo '<input type="image" src="' . osc_icon_raw('trash.png') . '" title="' . OSCOM::getDef('icon_trash') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'BatchDeleteEntries&id=' . $_GET['id']) . '\';" />'; ?></th>
<th align="center" width="20"><?php echo osc_draw_checkbox_field('batchFlag', null, null, 'onclick="flagCheckboxes(this);"'); ?></th>
</tr>
</tfoot>
@@ -75,10 +75,10 @@
var dataTableName = 'taxClassEntriesDataTable';
var dataTableDataURL = '<?php echo OSCOM::getRPCLink(null, null, 'id=' . $_GET['id'] . '&action=getAllEntries'); ?>';
- var entryEditLink = '<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&rID=ENTRYID&action=EntrySave'); ?>';
+ var entryEditLink = '<?php echo OSCOM::getLink(null, null, 'EntrySave&id=' . $_GET['id'] . '&rID=ENTRYID'); ?>';
var entryEditLinkIcon = '<?php echo osc_icon('edit.png'); ?>';
- var entryDeleteLink = '<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&rID=ENTRYID&action=EntryDelete'); ?>';
+ var entryDeleteLink = '<?php echo OSCOM::getLink(null, null, 'EntryDelete&id=' . $_GET['id'] . '&rID=ENTRYID'); ?>';
var entryDeleteLinkIcon = '<?php echo osc_icon('trash.png'); ?>';
var osC_DataTable = new osC_DataTable();
View
4 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries_batch_delete.php
@@ -22,7 +22,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . OSCOM::getDef('action_heading_batch_delete_tax_rates'); ?></h3>
- <form name="rDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=BatchDeleteEntries'); ?>" method="post">
+ <form name="rDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'BatchDeleteEntries&Process&id=' . $_GET['id']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_batch_delete_tax_rates'); ?></p>
@@ -38,7 +38,7 @@
}
if ( !empty($names_string) ) {
- $names_string = substr($names_string, 0, -2) . osc_draw_hidden_field('subaction', 'confirm');
+ $names_string = substr($names_string, 0, -2);
}
echo '<p>' . $names_string . '</p>';
View
4 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries_delete.php
@@ -26,13 +26,13 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . $OSCOM_ObjectInfo->get('tax_class_title') . ': ' . $OSCOM_ObjectInfo->getProtected('geo_zone_name'); ?></h3>
- <form name="rDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&rID=' . $OSCOM_ObjectInfo->getInt('tax_rates_id') . '&action=EntryDelete'); ?>" method="post">
+ <form name="rDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'EntryDelete&Process&id=' . $_GET['id'] . '&rID=' . $OSCOM_ObjectInfo->getInt('tax_rates_id')); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_delete_tax_rate'); ?></p>
<p><?php echo '<b>' . $OSCOM_ObjectInfo->getProtected('tax_class_title') . ': ' . $OSCOM_ObjectInfo->getProtected('geo_zone_name') . '</b>'; ?></p>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'trash', 'title' => OSCOM::getDef('button_delete'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'trash', 'title' => OSCOM::getDef('button_delete'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
4 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries_edit.php
@@ -34,7 +34,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('edit.png') . ' ' . $OSCOM_ObjectInfo->getProtected('tax_class_title') . ': ' . $OSCOM_ObjectInfo->getProtected('geo_zone_name'); ?></h3>
- <form name="rEdit" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&rID=' . $OSCOM_ObjectInfo->getInt('tax_rates_id') . '&action=EntrySave'); ?>" method="post">
+ <form name="rEdit" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'EntrySave&Process&id=' . $_GET['id'] . '&rID=' . $OSCOM_ObjectInfo->getInt('tax_rates_id')); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_edit_tax_rate'); ?></p>
@@ -45,7 +45,7 @@
<p><label for="tax_priority"><?php echo OSCOM::getDef('field_tax_rate_priority'); ?></label><?php echo osc_draw_input_field('tax_priority', $OSCOM_ObjectInfo->getInt('tax_priority')); ?></p>
</fieldset>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
4 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries_new.php
@@ -31,7 +31,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('new.png') . ' ' . OSCOM::getDef('action_heading_new_tax_rate'); ?></h3>
- <form name="rNew" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=EntrySave'); ?>" method="post">
+ <form name="rNew" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'EntrySave&Process&id=' . $_GET['id']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_new_tax_rate'); ?></p>
@@ -42,7 +42,7 @@
<p><label for="tax_priority"><?php echo OSCOM::getDef('field_tax_rate_priority'); ?></label><?php echo osc_draw_input_field('tax_priority'); ?></p>
</fieldset>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
8 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/main.php
@@ -22,7 +22,7 @@
<form id="liveSearchForm">
<input type="text" id="liveSearchField" name="search" class="searchField fieldTitleAsDefault" title="Search.." /><?php echo osc_draw_button(array('type' => 'button', 'params' => 'onclick="osC_DataTable.reset();"', 'title' => 'Reset')); ?>
- <span style="float: right;"><?php echo osc_draw_button(array('href' => OSCOM::getLink(null, null, 'action=Save'), 'icon' => 'plus', 'title' => OSCOM::getDef('button_insert'))); ?></span>
+ <span style="float: right;"><?php echo osc_draw_button(array('href' => OSCOM::getLink(null, null, 'Save'), 'icon' => 'plus', 'title' => OSCOM::getDef('button_insert'))); ?></span>
</form>
<div style="padding: 20px 5px 5px 5px; height: 16px;">
@@ -42,7 +42,7 @@
</thead>
<tfoot>
<tr>
- <th align="right" colspan="2"><?php echo '<input type="image" src="' . osc_icon_raw('trash.png') . '" title="' . OSCOM::getDef('icon_trash') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'action=BatchDelete') . '\';" />'; ?></th>
+ <th align="right" colspan="2"><?php echo '<input type="image" src="' . osc_icon_raw('trash.png') . '" title="' . OSCOM::getDef('icon_trash') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'BatchDelete') . '\';" />'; ?></th>
<th align="center" width="20"><?php echo osc_draw_checkbox_field('batchFlag', null, null, 'onclick="flagCheckboxes(this);"'); ?></th>
</tr>
</tfoot>
@@ -76,10 +76,10 @@
var classLink = '<?php echo OSCOM::getLink(null, null, 'id=CLASSID'); ?>';
var classLinkIcon = '<?php echo osc_icon('folder.png'); ?>';
- var classEditLink = '<?php echo OSCOM::getLink(null, null, 'id=CLASSID&action=Save'); ?>';
+ var classEditLink = '<?php echo OSCOM::getLink(null, null, 'Save&id=CLASSID'); ?>';
var classEditLinkIcon = '<?php echo osc_icon('edit.png'); ?>';
- var classDeleteLink = '<?php echo OSCOM::getLink(null, null, 'id=CLASSID&action=Delete'); ?>';
+ var classDeleteLink = '<?php echo OSCOM::getLink(null, null, 'Delete&id=CLASSID'); ?>';
var classDeleteLinkIcon = '<?php echo osc_icon('trash.png'); ?>';
var osC_DataTable = new osC_DataTable();
View
4 osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/new.php
@@ -22,7 +22,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('new.png') . ' ' . OSCOM::getDef('action_heading_new_tax_class'); ?></h3>
- <form name="tcNew" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'action=Save'); ?>" method="post">
+ <form name="tcNew" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'Save&Process'); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_new_tax_class'); ?></p>
@@ -31,7 +31,7 @@
<p><label for="tax_class_description"><?php echo OSCOM::getDef('field_description'); ?></label><?php echo osc_draw_input_field('tax_class_description'); ?></p>
</fieldset>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.