oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow TaxDriver getEditForm to use FormBuilder

Browse source 
There would be far too much rewriting in order to change the EU
driver to use FormBuilder. We can revisit that later.
This commit is contained in:
Doug Bell 2011-02-16 15:53:51 -06:00
parent 1d8b1b1b3a
commit 2170509c0f
5 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/WebGUI/Shop/Tax.pm
View file

@ -244,10 +244,15 @@ sub www_manage {
# }
my $taxDriver = $self->getDriver;
my $editForm = $taxDriver->getEditForm;
my $editFormHtml = '';
if ( blessed $editForm and $editForm->isa( 'WebGUI::FormBuilder' ) ) {
$editFormHtml = $editForm->toHtml;
}
my $output =
$pluginSwitcher
. '<fieldset><legend>Plugin configuration</legend>'
. $taxDriver->getConfigurationScreen
. $editFormHtml
. '</fieldset>'
;

6
lib/WebGUI/Shop/TaxDriver.pm
View file

@ -177,13 +177,13 @@ sub className {
#-----------------------------------------------------------
=head2 getConfigurationScreen ( )
=head2 getEditForm ( )
Returns the configuration screen that contains the configuration options for this plugin in the admin console.
Returns the edit form that contains the configuration options for this plugin in the admin console.
=cut
sub getConfigurationScreen {
sub getEditForm {
return 'This plugin has no configuration options';
}

26
lib/WebGUI/Shop/TaxDriver/EU.pm
View file

@ -291,13 +291,13 @@ sub deleteVATNumber {
#-----------------------------------------------------------
=head2 getConfigurationScreen ( )
=head2 getEditForm ( )
Returns the form that contains the configuration options for this plugin in the admin console.
=cut
sub getConfigurationScreen {
sub getEditForm {
my $self = shift;
my $session = $self->session;
my $i18n = WebGUI::International->new( $session, 'TaxDriver_EU' );
@ -310,48 +310,48 @@ sub getConfigurationScreen {
);
# General setting form
my $f = WebGUI::HTMLForm->new( $session );
$f->hidden(
my $f = WebGUI::FormBuilder->new( $session );
$f->addField( "hidden",
name => 'shop',
value => 'tax',
);
$f->hidden(
$f->addField( "hidden",
name => 'method',
value => 'do',
);
$f->hidden(
$f->addField( "hidden",
name => 'do',
value => 'saveConfiguration',
);
$f->selectBox(
$f->addField( "selectBox",
name => 'shopCountry',
value => $self->get( 'shopCountry' ),
label => $i18n->get('shop country'),
hoverHelp => $i18n->get('shop country help'),
options => \%countryOptions,
);
$f->template(
$f->addField( "template",
name => 'userTemplateId',
value => $self->get('userTemplateId'),
label => $i18n->get('user template'),
hoverHelp => $i18n->get('user template help'),
namespace => 'TaxDriver/EU/User',
);
$f->yesNo(
$f->addField( "yesNo",
name => 'automaticViesApproval',
value => $self->get('automaticViesApproval'),
label => $i18n->get('auto vies approval'),
hoverHelp => $i18n->get('auto vies approval help'),
);
$f->yesNo(
$f->addField( "yesNo",
name => 'acceptOnViesUnavailable',
value => $self->get('acceptOnViesUnavailable'),
label => $i18n->get('accept when vies unavailable'),
hoverHelp => $i18n->get('accept when vies unavailable help'),
);
$f->submit;
my $general = $f->print;
$f->addField( "submit", name => "submit" );
my $general = $f->toHtml;
# VAT groups manager
my $vatGroups =
@ -365,7 +365,7 @@ sub getConfigurationScreen {
. $i18n->get('rate')
. WebGUI::Form::float( $session, { name => 'rate' } )
. '%'
. WebGUI::Form::submit( $session, { value => 'Add' } )
. WebGUI::Form::submit( $session, { name => 'submit', value => 'Add' } )
. WebGUI::Form::formFooter( $session );
# Wrap output in a YUI Tab widget.

4
lib/WebGUI/Shop/TaxDriver/Generic.pm
View file

@ -528,13 +528,13 @@ sub www_importTax {
#-----------------------------------------------------------
=head2 getConfigurationScreen ( )
=head2 getEditForm ( )
Returns the form that contains the configuration options for this plugin in the admin console.
=cut
sub getConfigurationScreen {
sub getEditForm {
my $self = shift;
my $session = $self->session;
my $status_message = $session->stow->get( 'tax_message' );